From: masensio <masensio@solidgear.es>
Date: Tue, 1 Sep 2015 14:51:40 +0000 (+0200)
Subject: Merge branch 'develop' into uploadWhenCharging
X-Git-Tag: beta-20151122~103^2~3^2~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/efb3989ee67b2d7d7bb16725d7b5bfd172b5d134?ds=inline;hp=efb3989ee67b2d7d7bb16725d7b5bfd172b5d134

Merge branch 'develop' into uploadWhenCharging

Conflicts:
	res/values-fr/strings.xml
	res/xml/preferences.xml
---