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)
commitb66e309dfa8b145a293cb47b7cbcf588dc0c79ab
treec17d0ea86ca10de678e04ba73f938c8e55bd2d88
parent31f6e61f894efd0867d1a34c8d3cb53d7bb5fc4a
parent9681b8687ecdfa4238d628c929043c69da8709c7
Merge branch 'contact_settings' into setup_app_name

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