Merge branch 'develop' into send_file_pr311_with_develop
authormasensio <masensio@solidgear.es>
Thu, 27 Feb 2014 07:40:17 +0000 (08:40 +0100)
committermasensio <masensio@solidgear.es>
Thu, 27 Feb 2014 07:40:17 +0000 (08:40 +0100)
1  2 
src/com/owncloud/android/ui/activity/FileDisplayActivity.java