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)
commitb8b8cac0d9290946a501de38163efad2fa615e6d
tree8d76c1172baba12faa2a8e7be4278ed5dce0f0f5
parent3ac67b3001eb36b0bcf49b0798a8d4e0dc1e9953
parent2702951056c4b2dc0e6c085088a467601b331c2d
Merge branch 'master' of github.com:owncloud/android into streaming