Merge branch 'develop' into refresh_folder_contents_when_browsed_into
authormasensio <masensio@solidgear.es>
Fri, 20 Sep 2013 08:19:44 +0000 (10:19 +0200)
committermasensio <masensio@solidgear.es>
Fri, 20 Sep 2013 08:19:44 +0000 (10:19 +0200)
Conflicts:
src/com/owncloud/android/operations/SynchronizeFolderOperation.java


No differences found