Merge remote-tracking branch 'origin/release-1.7.2' into release-1.7.2
authorDavid A. Velasco <dvelasco@solidgear.es>
Mon, 22 Jun 2015 12:56:13 +0000 (14:56 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Mon, 22 Jun 2015 12:56:13 +0000 (14:56 +0200)
1  2 
res/values/strings.xml

Simple merge