masensio d6267698e8 Merge branch 'develop' into refresh_folder_contents_when_browsed_into ... Conflicts: src/com/owncloud/android/operations/SynchronizeFolderOperation.java		2013-09-20 10:19:44 +02:00
..
com/owncloud/android	Merge branch 'develop' into refresh_folder_contents_when_browsed_into	2013-09-20 10:19:44 +02:00
eu/alefzero/webdav	Merge branch 'develop' into refresh_folder_contents_when_browsed_into	2013-09-20 10:19:44 +02:00