From: masensio <masensio@solidgear.es>
Date: Wed, 30 Sep 2015 08:49:47 +0000 (+0200)
Subject: Merge branch 'master' of github.com:owncloud/android
X-Git-Tag: oc-android-1.9^2~64
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/8090269d557590a6d50f184006abef6c9bb7d399?ds=inline;hp=--cc

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

Conflicts:
	CHANGELOG.md
---

8090269d557590a6d50f184006abef6c9bb7d399