From: tobiasKaminsky Date: Wed, 7 Oct 2015 20:31:37 +0000 (+0200) Subject: Merge branch 'master' of github.com:owncloud/android into cancelWlan X-Git-Tag: beta-20151122~23^2~1 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/25410ff36a8509e7439272b88ccd31c340c8e254?ds=inline;hp=--cc Merge branch 'master' of github.com:owncloud/android into cancelWlan --- 25410ff36a8509e7439272b88ccd31c340c8e254