Merge branch 'setup_multiaccount' into setup_app_name
authormasensio <masensio@solidgear.es>
Tue, 22 Oct 2013 08:27:28 +0000 (10:27 +0200)
committermasensio <masensio@solidgear.es>
Tue, 22 Oct 2013 08:27:28 +0000 (10:27 +0200)

Trivial merge