Merge branch 'master' of github.com:owncloud/android into multiSelect
authortobiasKaminsky <tobias@kaminsky.me>
Wed, 30 Sep 2015 16:40:13 +0000 (18:40 +0200)
committertobiasKaminsky <tobias@kaminsky.me>
Wed, 30 Sep 2015 16:40:13 +0000 (18:40 +0200)

Trivial merge