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)
commit066cd5aab34344264d2269e6a03785d20226b7e9
tree100e6b54a20b808ff19d9dd6c35efbc4b81c922b
parentb708d46defe3f3596167e9ef9e71c4efacba8d49
parenta67a6766a6ca69bb97d2fdc87256ec9f0fa5122d
Merge branch 'develop' into contact_settings

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