Merge branch 'develop'after SPRINT-002
authorDavid A. Velasco <dvelasco@solidgear.es>
Wed, 19 Jun 2013 15:56:46 +0000 (17:56 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Wed, 19 Jun 2013 15:56:46 +0000 (17:56 +0200)
commit63a3522ab7c8940ccc48be09e2247f86cbf60598
treecc19f99becaf4fd512733333b45a2c62c22544e5
parent9d24b7ca537d44cff3a5adb84e3801ce102c92ad
parent5e49cadb2a0fe432e0c81d078279c3bf11769537
Merge branch 'develop'after SPRINT-002

Conflicts:
.classpath
.classpath
res/values-pt-rBR/strings.xml
res/values/strings.xml