Merge branch 'master' into captcha
commit42fc90c0adbe748c030edcbeee71befb82c24dc0
authorFelix Bechstein <f@ub0r.de>
Wed, 21 Oct 2009 17:13:48 +0000 (21 19:13 +0200)
committerFelix Bechstein <f@ub0r.de>
Wed, 21 Oct 2009 17:13:48 +0000 (21 19:13 +0200)
tree6c923004651c13774121b941252c0a41677d715f
parent7bc73bfe0164c579dd6d220bd1fd0352797c3264
parent2af976e5a8f7b6b1e1fcf96c6e833316289e9879
Merge branch 'master' into captcha
res/values-de/strings.xml
res/values/strings.xml
src/de/ub0r/android/andGMXsms/Connector.java
src/de/ub0r/android/andGMXsms/WebSMS.java