Merge branch 'develop' into clean_up
authorDavid A. Velasco <dvelasco@solidgear.es>
Mon, 28 Oct 2013 09:11:40 +0000 (10:11 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Mon, 28 Oct 2013 09:11:40 +0000 (10:11 +0100)
1  2 
res/values/strings.xml

Simple merge