Merge branch 'target_marshmallow' of https://github.com/owncloud/android into target_...
authorAndy Scherzinger <info@andy-scherzinger.de>
Mon, 2 Nov 2015 11:29:13 +0000 (12:29 +0100)
committerAndy Scherzinger <info@andy-scherzinger.de>
Mon, 2 Nov 2015 11:29:13 +0000 (12:29 +0100)

Trivial merge