Merge branch 'new-filetype-icons' of https://github.com/Kernald/owncloud-android...
authorAndy Scherzinger <info@andy-scherzinger.de>
Mon, 7 Sep 2015 12:36:59 +0000 (14:36 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Mon, 7 Sep 2015 12:36:59 +0000 (14:36 +0200)

Trivial merge