From: masensio <masensio@solidgear.es>
Date: Fri, 20 Sep 2013 08:19:44 +0000 (+0200)
Subject: Merge branch 'develop' into refresh_folder_contents_when_browsed_into
X-Git-Tag: oc-android-1.5.5~155^2~41
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/d6267698e85f19f9d32e1459738a6fb3500446e5?ds=sidebyside;hp=d6267698e85f19f9d32e1459738a6fb3500446e5

Merge branch 'develop' into refresh_folder_contents_when_browsed_into

Conflicts:
	src/com/owncloud/android/operations/SynchronizeFolderOperation.java
---