Merge branch 'develop' of github.com:owncloud/android into switchListVsGrid
authortobiasKaminsky <tobias@kaminsky.me>
Wed, 19 Aug 2015 17:24:33 +0000 (19:24 +0200)
committertobiasKaminsky <tobias@kaminsky.me>
Wed, 19 Aug 2015 17:24:33 +0000 (19:24 +0200)

Trivial merge