merge

author wiebe <redacted>

Sun, 25 Jan 2009 22:59:25 +0000 (23:59 +0100)

committer wiebe <redacted>

Sun, 25 Jan 2009 22:59:25 +0000 (23:59 +0100)
author wiebe <redacted>
Sun, 25 Jan 2009 22:59:25 +0000 (23:59 +0100)
committer wiebe <redacted>
Sun, 25 Jan 2009 22:59:25 +0000 (23:59 +0100)
diff --cc series

index dfe582ecde6d3b901363fb872339f2999a942b25,3fcddfa6ee7a97ae2808406dc21f38604861d7b8..0c9d245def939068e12a6cff2985faed4524c496
--- 1/series
--- 2/series
+++ b/series
@@@ -27,6 -27,6 +27,7 @@@ operglinenick.patc
   operping.patch
   minoplevel.patch
   oplevelforward.patch
+ +welcome.patch
   accountcollision.patch
   split.patch
+ match.patch