From: tobiasKaminsky <tobias@kaminsky.me>
Date: Fri, 21 Nov 2014 16:58:01 +0000 (+0100)
Subject: Merge branch 'develop' of git@github.com:owncloud/android.git into
X-Git-Tag: oc-android-1.7.0_signed~42^2~17
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/b2158a8673b5a558cbb6e8f754196c9b5d96ede4?hp=b2158a8673b5a558cbb6e8f754196c9b5d96ede4

Merge branch 'develop' of git@github.com:owncloud/android.git into
developNew

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