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)
commitd6267698e85f19f9d32e1459738a6fb3500446e5
tree5ae28b0dc890e6ebce79cdf9bf0cc7cc00e0b486
parent31615a24ce0bacc28a4edc602678282cfc31af35
parent68d4c74fdaba1dcbf135b4b84adfd7def15f2730
Merge branch 'develop' into refresh_folder_contents_when_browsed_into

Conflicts:
src/com/owncloud/android/operations/SynchronizeFolderOperation.java
src/com/owncloud/android/datamodel/FileDataStorageManager.java
src/com/owncloud/android/operations/RemoteOperationResult.java
src/com/owncloud/android/operations/SynchronizeFileOperation.java
src/com/owncloud/android/operations/SynchronizeFolderOperation.java
src/com/owncloud/android/providers/FileContentProvider.java