Merge branch '0.9.x' into 1.0.x

Conflicts: README
2011-01-12 18:05:56 -05:00
parent 32eb4c5e2d 906f2ed023
commit f9b2feb7f5
30 changed files with 1113 additions and 226 deletions
--- a/db/sms_carrier.sql
+++ b/db/sms_carrier.sql
@@ -62,4 +62,5 @@ VALUES
    (100114, 'Vodafone Germany', '%s@vodafone-sms.de', now()),
    (100115, 'E-Plus', '%s@smsmail.eplus.de', now()),
    (100116, 'Cellular South', '%s@csouth1.com', now()),
-    (100117, 'ChinaMobile (139)', '%s@139.com', now());
+    (100117, 'ChinaMobile (139)', '%s@139.com', now()),
+    (100118, 'Dialog Axiata', '%s@dialog.lk', now());