Merge branch 'master' into captcha
commitab41749949c9f837167c8be488858dc19a402968
authorFelix Bechstein <f@ub0r.de>
Sun, 25 Oct 2009 20:50:03 +0000 (25 21:50 +0100)
committerFelix Bechstein <f@ub0r.de>
Sun, 25 Oct 2009 20:50:03 +0000 (25 21:50 +0100)
treeb2c208bd179fc680557e262197ba4cd7652467d7
parente902b9a650a6630fc96e74c115cfd95567201550
parent20654a4cf5e43e701c7b4f7e088f997e6bdb9da3
Merge branch 'master' into captcha
res/values-de/strings.xml
res/values/strings.xml
src/de/ub0r/android/andGMXsms/WebSMS.java