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)
commit7edbe05bb524b0194d7ad9fb45bfd9d8f1250d51
treeffcaa918442e63a07edf78a5bfc76f7374e57b4e
parent76ba00b2b23f5c2079a6635dc5e661850c3c5dfb
parent826c7405f67a1330dd45999e048ae4f2c0a5fbad
Merge remote-tracking branch 'origin/master'

Conflicts:
res/values-ca/strings.xml
res/values-el/strings.xml
res/values-ca/strings.xml
res/values-de/strings.xml
res/values-el/strings.xml
res/values-es/strings.xml
res/values-fr/strings.xml
res/values-it/strings.xml
res/values-pl/strings.xml
res/values-sl/strings.xml