Merge remote-tracking branch 'origin/master'
authorDavid A. Velasco <dvelasco@solidgear.es>
Mon, 8 Oct 2012 07:10:37 +0000 (09:10 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Mon, 8 Oct 2012 07:10:37 +0000 (09:10 +0200)
Conflicts:
res/values-ca/strings.xml
res/values-el/strings.xml


No differences found