From: masensio <masensio@solidgear.es>
Date: Fri, 18 Oct 2013 10:42:00 +0000 (+0200)
Subject: Merge branch 'contact_settings' into setup_app_name
X-Git-Tag: oc-android-1.5.5~159^2~7
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/b66e309dfa8b145a293cb47b7cbcf588dc0c79ab?hp=b66e309dfa8b145a293cb47b7cbcf588dc0c79ab

Merge branch 'contact_settings' into setup_app_name

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