Merge branch 'master' of github.com:owncloud/android into resizeCache
authortobiasKaminsky <tobias@kaminsky.me>
Sat, 14 Nov 2015 15:33:22 +0000 (16:33 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Sat, 14 Nov 2015 15:33:22 +0000 (16:33 +0100)

No differences found