Merge branch 'develop' into automationTest
authorpurigarcia <pgarcia@solidgear.es>
Mon, 11 May 2015 06:16:43 +0000 (08:16 +0200)
committerpurigarcia <pgarcia@solidgear.es>
Mon, 11 May 2015 06:16:43 +0000 (08:16 +0200)
1  2 
res/values/strings.xml

Simple merge