From: masensio <masensio@solidgear.es>
Date: Tue, 22 Oct 2013 11:02:41 +0000 (+0200)
Subject: Merge branch 'contact_settings' into setup_app_name
X-Git-Tag: oc-android-1.5.5~159^2~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/865940064dd70fdaa8a59e0768ae57a487923967?hp=aabdaee86861832d15558f91f040479a1906beee

Merge branch 'contact_settings' into setup_app_name
---

diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 3a6e0523..a7f76f5b 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -49,7 +49,7 @@
     <Preference android:title="@string/prefs_help" android:key="help" />
     <Preference android:title="@string/prefs_recommend" android:key="recommend" />
     <Preference android:title="@string/prefs_feedback" android:key="feedback" />
-    <!-- Preference android:title="@string/prefs_imprint" android:key="imprint" / -->
+    <Preference android:title="@string/prefs_imprint" android:key="imprint" />
                         
 	<Preference 		android:id="@+id/about_app" 
         				android:title="@string/about_title"