Merge pull request #1095 from owncloud/text_file_preview_pr_707_with_develop
authormasensio <masensio@solidgear.es>
Mon, 7 Sep 2015 08:47:05 +0000 (10:47 +0200)
committermasensio <masensio@solidgear.es>
Mon, 7 Sep 2015 08:47:05 +0000 (10:47 +0200)
Text file preview pr 707 with develop


Trivial merge