From: jabarros <jabarros@solidgear.es>
Date: Tue, 9 Sep 2014 11:17:41 +0000 (+0200)
Subject: Merge branch 'develop' into ADFS_auth_support
X-Git-Tag: oc-android-1.7.0_signed~193^2~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/ba6c6375cfc0feb7104d79ab98e2dcd198eb7dc1?ds=inline;hp=ba6c6375cfc0feb7104d79ab98e2dcd198eb7dc1

Merge branch 'develop' into ADFS_auth_support

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