Merge branch 'develop' into operations_service
authormasensio <masensio@solidgear.es>
Thu, 3 Apr 2014 15:00:02 +0000 (17:00 +0200)
committermasensio <masensio@solidgear.es>
Thu, 3 Apr 2014 15:00:02 +0000 (17:00 +0200)
commitb017073e960ad2039a823740b5f1ca1771d23278
treec980fc41a234fab234e033b00000cb3f3c68f128
parenteb95be232f4e07a044fa692c1254fecaa60f52ee
parent901b6ac61e4a84d281e86b4989aa099801b28de7
Merge branch 'develop' into operations_service
res/values/strings.xml