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)
commitac836eddb76f9489d4ed643802f6c89b184a88c3
treeeef0d0f1a9cbdf495404bc142d12485ee5d5f13c
parentaaba7b2725aa45360a2d818c50455ee14c5939d1
parent0641afc93d56f4d3be4ab3cf7dcebb455dea24f0
Merge branch 'develop' into send_file_pr311_with_develop
src/com/owncloud/android/ui/activity/FileDisplayActivity.java