Merge branch 'master' of github.com:owncloud/android into multiSelect
authortobiasKaminsky <tobias@kaminsky.me>
Tue, 29 Sep 2015 19:13:31 +0000 (21:13 +0200)
committertobiasKaminsky <tobias@kaminsky.me>
Tue, 29 Sep 2015 19:13:31 +0000 (21:13 +0200)

Trivial merge