Merge branch 'develop' into contact_settings
authormasensio <masensio@solidgear.es>
Tue, 15 Oct 2013 12:07:59 +0000 (14:07 +0200)
committermasensio <masensio@solidgear.es>
Tue, 15 Oct 2013 12:07:59 +0000 (14:07 +0200)
Conflicts:
res/values/strings.xml


No differences found