Merge branch 'master' of github.com:owncloud/android into cancelWlan
authortobiasKaminsky <tobias@kaminsky.me>
Wed, 7 Oct 2015 20:31:37 +0000 (22:31 +0200)
committertobiasKaminsky <tobias@kaminsky.me>
Wed, 7 Oct 2015 20:31:37 +0000 (22:31 +0200)

Trivial merge