Merge branch 'master' of github.com:owncloud/android into cancelWlan
authortobiasKaminsky <tobias@kaminsky.me>
Wed, 7 Oct 2015 20:31:37 +0000 (22:31 +0200)
committertobiasKaminsky <tobias@kaminsky.me>
Wed, 7 Oct 2015 20:31:37 +0000 (22:31 +0200)
commit25410ff36a8509e7439272b88ccd31c340c8e254
treed9b0444252be1071b79e3e3f538a2543aee63a27
parentc0a3399573c9b10cf4729ae02070003932ecf884
parent567355eed079c0fe301bf6f8d2117d39ce537c6f
Merge branch 'master' of github.com:owncloud/android into cancelWlan