Merge branch 'beta' of github.com:owncloud/android into beta
authortobiasKaminsky <tobias@kaminsky.me>
Mon, 30 Nov 2015 20:48:06 +0000 (21:48 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Mon, 30 Nov 2015 20:48:06 +0000 (21:48 +0100)

Trivial merge