Merge branch 'develop' into release-1.5.5
authorDavid A. Velasco <dvelasco@solidgear.es>
Mon, 24 Mar 2014 09:23:05 +0000 (10:23 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Mon, 24 Mar 2014 09:23:05 +0000 (10:23 +0100)
commitd2ff7d47553944206bcb904b423fa33b91ef0977
tree5f314642472da92f98da5b0ae391cd98fb1ac9ed
parenta9c0d1c62bd03e77322349356eaf6dd210e95ca1
parent612ccbb7afd7299a3412c7ffb120893c5a84687a
Merge branch 'develop' into release-1.5.5
res/values/strings.xml