Merge branch 'contact_settings' into setup_app_name
authormasensio <masensio@solidgear.es>
Tue, 22 Oct 2013 11:02:41 +0000 (13:02 +0200)
committermasensio <masensio@solidgear.es>
Tue, 22 Oct 2013 11:02:41 +0000 (13:02 +0200)
commit865940064dd70fdaa8a59e0768ae57a487923967
tree63745eec98bbfa44ba85a57e2a8e4f4c2741c6d4
parentaabdaee86861832d15558f91f040479a1906beee
parent01dcdc0672759c9cc0e79c7d0ad23a608a7992ba
Merge branch 'contact_settings' into setup_app_name