Merge branch 'master' of github.com:owncloud/android into streaming
authortobiasKaminsky <tobias@kaminsky.me>
Sun, 25 Oct 2015 07:13:56 +0000 (08:13 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Sun, 25 Oct 2015 07:13:56 +0000 (08:13 +0100)

Trivial merge