From: tobiasKaminsky <tobias@kaminsky.me>
Date: Sun, 25 Oct 2015 07:13:56 +0000 (+0100)
Subject: Merge branch 'master' of github.com:owncloud/android into streaming
X-Git-Tag: beta-20151122~53^2~6
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/b8b8cac0d9290946a501de38163efad2fa615e6d?hp=--cc

Merge branch 'master' of github.com:owncloud/android into streaming
---

b8b8cac0d9290946a501de38163efad2fa615e6d