Merge remote-tracking branch 'origin/develop' into refresh_folder_contents_when_brows...
authormasensio <masensio@solidgear.es>
Tue, 1 Oct 2013 10:58:17 +0000 (12:58 +0200)
committermasensio <masensio@solidgear.es>
Tue, 1 Oct 2013 10:58:17 +0000 (12:58 +0200)
commit5ff0989eb47fbc9d5211cc294f17cf692f7eff50
treed5f46bf61a0984c0ec2882bfe012b2c284aa3bf2
parenta8fade7369bc8d1752dc4ba5fe07935cac84e96f
parent8b137845223cbcce7a16ac10ec8a2b88908bc5fa
Merge remote-tracking branch 'origin/develop' into refresh_folder_contents_when_browsed_into
src/com/owncloud/android/datamodel/FileDataStorageManager.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java