Merge branch 'master' into develop
authorDavid A. Velasco <dvelasco@solidgear.es>
Thu, 19 Feb 2015 10:01:00 +0000 (11:01 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Thu, 19 Feb 2015 10:01:00 +0000 (11:01 +0100)
commitec6b9d7c70deb50152bfab5cb5f25c9a2dde28e7
tree56d20cbc5cfce699b6a44f4eef30915a3dd571de
parentae1bd1b6a158ea61230fea8822fd42eab358f467
parentfc435f64f0449b08dd6f7af3a5c9965756593a64
Merge branch 'master' into develop
res/values-az/strings.xml
res/values-cs-rCZ/strings.xml
res/values-de-rDE/strings.xml
res/values-de/strings.xml
res/values-ja-rJP/strings.xml