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)
commit4160e7e256cc91479a5ec883db32172a91ea8243
treec034afa15c3fea1d6a550384da5911cfe52390b6
parent2ce3ed31330e492ef5928d5b007517a7fb1f6add
parentdde58b6e673683844be625df19f16b50d4f1ab53
Merge branch 'develop' into clean_up
res/values/strings.xml