From: masensio <masensio@solidgear.es>
Date: Mon, 15 Jun 2015 12:51:13 +0000 (+0200)
Subject: Merge branch 'develop' into forbidden_characters_from_server
X-Git-Tag: oc-android-1.7.2~1^2~20^2~3
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/75fd0f40c642f3a4fc66dfa17620417d78dd2571?ds=inline;hp=75fd0f40c642f3a4fc66dfa17620417d78dd2571

Merge branch 'develop' into forbidden_characters_from_server

Conflicts:
	owncloud-android-library
	src/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.java
	src/com/owncloud/android/ui/dialog/RenameFileDialogFragment.java
---