From: masensio <masensio@solidgear.es>
Date: Mon, 7 Sep 2015 08:42:09 +0000 (+0200)
Subject: Merge branch 'master' into text_file_preview_pr_707_with_develop
X-Git-Tag: oc-android-1.8~17^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/1586eea7cbead33376c015b8a1b743e4cbcaf2a2

Merge branch 'master' into text_file_preview_pr_707_with_develop
---

1586eea7cbead33376c015b8a1b743e4cbcaf2a2