From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Sat, 28 Nov 2015 10:48:57 +0000 (+0100)
Subject: Merge branch 'target_marshmallow' of https://github.com/owncloud/android into beta
X-Git-Tag: beta-20151129~2^2~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/c94b5314b750083451bfc2587c5a492a057a88c4?ds=inline;hp=c94b5314b750083451bfc2587c5a492a057a88c4

Merge branch 'target_marshmallow' of https://github.com/owncloud/android into beta

Conflicts:
	build.gradle
---