Merge branch 'develop' into pull_down_refresh
authormasensio <masensio@solidgear.es>
Fri, 30 May 2014 12:16:33 +0000 (14:16 +0200)
committermasensio <masensio@solidgear.es>
Fri, 30 May 2014 12:16:33 +0000 (14:16 +0200)
commitca555b2cd87b8728c61dce808ccec1215e4caf2b
treedc024f828715453cd29c2ae5d816dabd1dfe582a
parentabbf2252a3d97f95ef967dfbe7fc01c45af5d6b9
parent17c9af3541892b2985bb951e90ca33c5cf77c7e2
Merge branch 'develop' into pull_down_refresh
src/com/owncloud/android/ui/activity/FileDisplayActivity.java