From: masensio <masensio@solidgear.es>
Date: Tue, 15 Oct 2013 12:07:59 +0000 (+0200)
Subject: Merge branch 'develop' into contact_settings
X-Git-Tag: oc-android-1.5.5~159^2~1^2~2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/066cd5aab34344264d2269e6a03785d20226b7e9?hp=066cd5aab34344264d2269e6a03785d20226b7e9

Merge branch 'develop' into contact_settings

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