Merge branch 'develop' into automationTest
authorpurigarcia <pgarcia@solidgear.es>
Wed, 6 May 2015 17:05:03 +0000 (19:05 +0200)
committerpurigarcia <pgarcia@solidgear.es>
Wed, 6 May 2015 17:05:03 +0000 (19:05 +0200)
1  2 
res/values/strings.xml

Simple merge