Merge branch 'master' into text_file_preview_pr_707_with_develop
authormasensio <masensio@solidgear.es>
Fri, 4 Sep 2015 12:31:10 +0000 (14:31 +0200)
committermasensio <masensio@solidgear.es>
Fri, 4 Sep 2015 12:31:10 +0000 (14:31 +0200)
commitfc5c4d899c1e51af26ee1d0c5818c4580386181c
treefb20a0c0dfab0f4d473b7d5d53fb26e1bce05feb
parent6b84d83b3544f8de4e56186f6ecbccd3d612702b
parentf787213cd1cae854c169d263d3636e1de4dffa94
Merge branch 'master' into text_file_preview_pr_707_with_develop

Conflicts:
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java