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)

Trivial merge