Merge branch 'contact_settings' into setup_app_name
authormasensio <masensio@solidgear.es>
Fri, 18 Oct 2013 10:42:00 +0000 (12:42 +0200)
committermasensio <masensio@solidgear.es>
Fri, 18 Oct 2013 10:42:00 +0000 (12:42 +0200)
Conflicts:
res/values/setup.xml


No differences found