diff --git a/include/znc/Buffer.h b/include/znc/Buffer.h
index 2613fab6..c99b7d02 100644
--- a/include/znc/Buffer.h
+++ b/include/znc/Buffer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/include/znc/Chan.h b/include/znc/Chan.h
index 0a0c1079..11a50e32 100644
--- a/include/znc/Chan.h
+++ b/include/znc/Chan.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/include/znc/Client.h b/include/znc/Client.h
index 424b5ab2..7cc34a81 100644
--- a/include/znc/Client.h
+++ b/include/znc/Client.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/include/znc/Config.h b/include/znc/Config.h
index e98131ca..990e4592 100644
--- a/include/znc/Config.h
+++ b/include/znc/Config.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/include/znc/ExecSock.h b/include/znc/ExecSock.h
index 93ea916b..01336bae 100644
--- a/include/znc/ExecSock.h
+++ b/include/znc/ExecSock.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/include/znc/FileUtils.h b/include/znc/FileUtils.h
index 89cac8cc..567ba218 100644
--- a/include/znc/FileUtils.h
+++ b/include/znc/FileUtils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/include/znc/HTTPSock.h b/include/znc/HTTPSock.h
index 94a008c4..219bb8d1 100644
--- a/include/znc/HTTPSock.h
+++ b/include/znc/HTTPSock.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/include/znc/IRCNetwork.h b/include/znc/IRCNetwork.h
index 82e36310..a9ea3336 100644
--- a/include/znc/IRCNetwork.h
+++ b/include/znc/IRCNetwork.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/include/znc/IRCSock.h b/include/znc/IRCSock.h
index 26a79e4e..3a4e05d7 100644
--- a/include/znc/IRCSock.h
+++ b/include/znc/IRCSock.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/include/znc/Listener.h b/include/znc/Listener.h
index 09088cc0..063ac272 100644
--- a/include/znc/Listener.h
+++ b/include/znc/Listener.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/include/znc/Modules.h b/include/znc/Modules.h
index fab06c09..f4c4dd6a 100644
--- a/include/znc/Modules.h
+++ b/include/znc/Modules.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/include/znc/Nick.h b/include/znc/Nick.h
index 5ad892ec..182c3a7e 100644
--- a/include/znc/Nick.h
+++ b/include/znc/Nick.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/include/znc/Server.h b/include/znc/Server.h
index cb18d67e..c7e47e9d 100644
--- a/include/znc/Server.h
+++ b/include/znc/Server.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/include/znc/Socket.h b/include/znc/Socket.h
index 086410c8..a1c258f6 100644
--- a/include/znc/Socket.h
+++ b/include/znc/Socket.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/include/znc/Template.h b/include/znc/Template.h
index 6f69ce6c..43676fba 100644
--- a/include/znc/Template.h
+++ b/include/znc/Template.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/include/znc/User.h b/include/znc/User.h
index 68ac28b2..266c2931 100644
--- a/include/znc/User.h
+++ b/include/znc/User.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/include/znc/Utils.h b/include/znc/Utils.h
index 88a88ab6..210ac608 100644
--- a/include/znc/Utils.h
+++ b/include/znc/Utils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/include/znc/WebModules.h b/include/znc/WebModules.h
index a436c7d4..79df2492 100644
--- a/include/znc/WebModules.h
+++ b/include/znc/WebModules.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/include/znc/ZNCDebug.h b/include/znc/ZNCDebug.h
index ceb200f4..55cfe1b9 100644
--- a/include/znc/ZNCDebug.h
+++ b/include/znc/ZNCDebug.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/include/znc/ZNCString.h b/include/znc/ZNCString.h
index 9e5c87cf..477b8f79 100644
--- a/include/znc/ZNCString.h
+++ b/include/znc/ZNCString.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/include/znc/defines.h b/include/znc/defines.h
index 628b014e..699063b6 100644
--- a/include/znc/defines.h
+++ b/include/znc/defines.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/include/znc/main.h b/include/znc/main.h
index d04e07c9..35594dd3 100644
--- a/include/znc/main.h
+++ b/include/znc/main.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/include/znc/znc.h b/include/znc/znc.h
index 46ead889..daae5c62 100644
--- a/include/znc/znc.h
+++ b/include/znc/znc.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/admin.cpp b/modules/admin.cpp
index 2514d6bd..bac6a8a5 100644
--- a/modules/admin.cpp
+++ b/modules/admin.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  * Copyright (C) 2008 by Stefan Rado
  * based on admin.cpp by Sebastian Ramacher
  * based on admin.cpp in crox branch
diff --git a/modules/adminlog.cpp b/modules/adminlog.cpp
index 904369c0..2f6abad2 100644
--- a/modules/adminlog.cpp
+++ b/modules/adminlog.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/autoattach.cpp b/modules/autoattach.cpp
index afc60eca..54328c4b 100644
--- a/modules/autoattach.cpp
+++ b/modules/autoattach.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/autoop.cpp b/modules/autoop.cpp
index 505550e2..e989f488 100644
--- a/modules/autoop.cpp
+++ b/modules/autoop.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/autoreply.cpp b/modules/autoreply.cpp
index eebc6b9d..473d1e6e 100644
--- a/modules/autoreply.cpp
+++ b/modules/autoreply.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  * Copyright (C) 2008 Michael "Svedrin" Ziegler diese-addy@funzt-halt.net
  *
  * This program is free software; you can redistribute it and/or modify it
diff --git a/modules/awaynick.cpp b/modules/awaynick.cpp
index 3ecf9498..fcd94a4d 100644
--- a/modules/awaynick.cpp
+++ b/modules/awaynick.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/blockuser.cpp b/modules/blockuser.cpp
index 2e366588..e04287ee 100644
--- a/modules/blockuser.cpp
+++ b/modules/blockuser.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/bouncedcc.cpp b/modules/bouncedcc.cpp
index 202602be..33f89a4b 100644
--- a/modules/bouncedcc.cpp
+++ b/modules/bouncedcc.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/buffextras.cpp b/modules/buffextras.cpp
index d23d01ed..01581209 100644
--- a/modules/buffextras.cpp
+++ b/modules/buffextras.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/cert.cpp b/modules/cert.cpp
index fcdde30c..a5a2f4e8 100644
--- a/modules/cert.cpp
+++ b/modules/cert.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/certauth.cpp b/modules/certauth.cpp
index aa789540..c5f2ff42 100644
--- a/modules/certauth.cpp
+++ b/modules/certauth.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/chansaver.cpp b/modules/chansaver.cpp
index a19047bc..da5e2f26 100644
--- a/modules/chansaver.cpp
+++ b/modules/chansaver.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/clientnotify.cpp b/modules/clientnotify.cpp
index 1b9dd02a..488f2e76 100644
--- a/modules/clientnotify.cpp
+++ b/modules/clientnotify.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/crypt.cpp b/modules/crypt.cpp
index 68d72145..72d0842d 100644
--- a/modules/crypt.cpp
+++ b/modules/crypt.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/disconkick.cpp b/modules/disconkick.cpp
index 010cab8c..31fcec21 100644
--- a/modules/disconkick.cpp
+++ b/modules/disconkick.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/extra/antiidle.cpp b/modules/extra/antiidle.cpp
index 23add843..e4123928 100644
--- a/modules/extra/antiidle.cpp
+++ b/modules/extra/antiidle.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/extra/autoaway.cpp b/modules/extra/autoaway.cpp
index 57a647a6..e5672cc6 100644
--- a/modules/extra/autoaway.cpp
+++ b/modules/extra/autoaway.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/extra/autocycle.cpp b/modules/extra/autocycle.cpp
index d69a2e99..eaa6d91d 100644
--- a/modules/extra/autocycle.cpp
+++ b/modules/extra/autocycle.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/extra/autovoice.cpp b/modules/extra/autovoice.cpp
index 79ab72de..1ddbe6bf 100644
--- a/modules/extra/autovoice.cpp
+++ b/modules/extra/autovoice.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/extra/block_motd.cpp b/modules/extra/block_motd.cpp
index 2960f8a2..c4467771 100644
--- a/modules/extra/block_motd.cpp
+++ b/modules/extra/block_motd.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/extra/charset.cpp b/modules/extra/charset.cpp
index 60bdfc45..bd3b529b 100644
--- a/modules/extra/charset.cpp
+++ b/modules/extra/charset.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/extra/clearbufferonmsg.cpp b/modules/extra/clearbufferonmsg.cpp
index 733ca767..0df53788 100644
--- a/modules/extra/clearbufferonmsg.cpp
+++ b/modules/extra/clearbufferonmsg.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/extra/ctcpflood.cpp b/modules/extra/ctcpflood.cpp
index 48b04577..66d14ff5 100644
--- a/modules/extra/ctcpflood.cpp
+++ b/modules/extra/ctcpflood.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/extra/dcc.cpp b/modules/extra/dcc.cpp
index f9a8b404..8198993f 100644
--- a/modules/extra/dcc.cpp
+++ b/modules/extra/dcc.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/extra/droproot.cpp b/modules/extra/droproot.cpp
index f6e17b97..dce5c2a7 100644
--- a/modules/extra/droproot.cpp
+++ b/modules/extra/droproot.cpp
@@ -6,7 +6,7 @@
  * under the terms of the GNU General Public License version 2 as published
  * by the Free Software Foundation.
  *
- * Copyright (C) 2004-2008  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/extra/email.cpp b/modules/extra/email.cpp
index 18269311..5ee7f2aa 100644
--- a/modules/extra/email.cpp
+++ b/modules/extra/email.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/extra/fakeonline.cpp b/modules/extra/fakeonline.cpp
index ec348dd3..d8626550 100644
--- a/modules/extra/fakeonline.cpp
+++ b/modules/extra/fakeonline.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2011  See the AUTHORS file for details.
+ * Copyright (C) 2008-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/extra/flooddetach.cpp b/modules/extra/flooddetach.cpp
index 72da6e0a..dc69d545 100644
--- a/modules/extra/flooddetach.cpp
+++ b/modules/extra/flooddetach.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/extra/imapauth.cpp b/modules/extra/imapauth.cpp
index 8d994d2e..a17e85fd 100644
--- a/modules/extra/imapauth.cpp
+++ b/modules/extra/imapauth.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/extra/listsockets.cpp b/modules/extra/listsockets.cpp
index c45c8255..fcb68471 100644
--- a/modules/extra/listsockets.cpp
+++ b/modules/extra/listsockets.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/extra/motdfile.cpp b/modules/extra/motdfile.cpp
index 985a02f6..d7d8367a 100644
--- a/modules/extra/motdfile.cpp
+++ b/modules/extra/motdfile.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/extra/notify_connect.cpp b/modules/extra/notify_connect.cpp
index 2143cdad..08ec579a 100644
--- a/modules/extra/notify_connect.cpp
+++ b/modules/extra/notify_connect.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/extra/saslauth.cpp b/modules/extra/saslauth.cpp
index 7fedfc82..32b30a1c 100644
--- a/modules/extra/saslauth.cpp
+++ b/modules/extra/saslauth.cpp
@@ -1,6 +1,6 @@
 /**
  * Copyright (C) 2008 Heiko Hund <heiko@ist.eigentlich.net>
- * Copyright (C) 2008-2011  See the AUTHORS file for details.
+ * Copyright (C) 2008-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/extra/send_raw.cpp b/modules/extra/send_raw.cpp
index 921032a6..8869022b 100644
--- a/modules/extra/send_raw.cpp
+++ b/modules/extra/send_raw.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/extra/shell.cpp b/modules/extra/shell.cpp
index 770f706e..e659c8b1 100644
--- a/modules/extra/shell.cpp
+++ b/modules/extra/shell.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/fail2ban.cpp b/modules/fail2ban.cpp
index 4704a91f..43693962 100644
--- a/modules/fail2ban.cpp
+++ b/modules/fail2ban.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/identfile.cpp b/modules/identfile.cpp
index 37a950d7..727c7c5a 100644
--- a/modules/identfile.cpp
+++ b/modules/identfile.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/keepnick.cpp b/modules/keepnick.cpp
index 8c141491..aaddeaea 100644
--- a/modules/keepnick.cpp
+++ b/modules/keepnick.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/kickrejoin.cpp b/modules/kickrejoin.cpp
index 467bb147..81c9deda 100644
--- a/modules/kickrejoin.cpp
+++ b/modules/kickrejoin.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/lastseen.cpp b/modules/lastseen.cpp
index 1bc37c01..051ade8f 100644
--- a/modules/lastseen.cpp
+++ b/modules/lastseen.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/log.cpp b/modules/log.cpp
index 20065dde..8f533045 100644
--- a/modules/log.cpp
+++ b/modules/log.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2011  See the AUTHORS file for details.
+ * Copyright (C) 2008-2012  See the AUTHORS file for details.
  * Copyright (C) 2006-2007, CNU <bshalm@broadpark.no> (http://cnu.dieplz.net/znc)
  *
  * This program is free software; you can redistribute it and/or modify it
diff --git a/modules/modperl.cpp b/modules/modperl.cpp
index d41e1ae2..f2e6cafe 100644
--- a/modules/modperl.cpp
+++ b/modules/modperl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/modperl/codegen.pl b/modules/modperl/codegen.pl
index d27e46a0..02986510 100755
--- a/modules/modperl/codegen.pl
+++ b/modules/modperl/codegen.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 #
-# Copyright (C) 2004-2011  See the AUTHORS file for details.
+# Copyright (C) 2004-2012  See the AUTHORS file for details.
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 as published
@@ -17,7 +17,7 @@ open my $out, ">", $ARGV[1] or die;
 
 print $out <<'EOF';
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/modperl/modperl.i b/modules/modperl/modperl.i
index c62cd334..e98d1f0c 100644
--- a/modules/modperl/modperl.i
+++ b/modules/modperl/modperl.i
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/modperl/module.h b/modules/modperl/module.h
index a88efd5d..274b8990 100644
--- a/modules/modperl/module.h
+++ b/modules/modperl/module.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/modperl/pstring.h b/modules/modperl/pstring.h
index 6ba2bc43..d3e24a74 100644
--- a/modules/modperl/pstring.h
+++ b/modules/modperl/pstring.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/modperl/startup.pl b/modules/modperl/startup.pl
index 22e098e9..ce777388 100644
--- a/modules/modperl/startup.pl
+++ b/modules/modperl/startup.pl
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2004-2011  See the AUTHORS file for details.
+# Copyright (C) 2004-2012  See the AUTHORS file for details.
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 as published
diff --git a/modules/modpython.cpp b/modules/modpython.cpp
index 4c65a8a7..3c7f0ffb 100644
--- a/modules/modpython.cpp
+++ b/modules/modpython.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/modpython/codegen.pl b/modules/modpython/codegen.pl
index a12e2457..2b70cae1 100644
--- a/modules/modpython/codegen.pl
+++ b/modules/modpython/codegen.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 #
-# Copyright (C) 2004-2011  See the AUTHORS file for details.
+# Copyright (C) 2004-2012  See the AUTHORS file for details.
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 as published
@@ -18,7 +18,7 @@ open my $out, ">", $ARGV[1] or die;
 
 print $out <<'EOF';
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/modpython/compiler.cpp b/modules/modpython/compiler.cpp
index 08c1864f..5d20afe9 100644
--- a/modules/modpython/compiler.cpp
+++ b/modules/modpython/compiler.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/modpython/modpython.i b/modules/modpython/modpython.i
index 2c4a8a12..c21c27c6 100644
--- a/modules/modpython/modpython.i
+++ b/modules/modpython/modpython.i
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/modpython/module.h b/modules/modpython/module.h
index 150103af..f4e83dfc 100644
--- a/modules/modpython/module.h
+++ b/modules/modpython/module.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/modpython/retstring.h b/modules/modpython/retstring.h
index a562c8f3..5879ae0d 100644
--- a/modules/modpython/retstring.h
+++ b/modules/modpython/retstring.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/modpython/znc.py b/modules/modpython/znc.py
index 6a924140..fdf36897 100644
--- a/modules/modpython/znc.py
+++ b/modules/modpython/znc.py
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2004-2011  See the AUTHORS file for details.
+# Copyright (C) 2004-2012  See the AUTHORS file for details.
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 as published
diff --git a/modules/modtcl.cpp b/modules/modtcl.cpp
index 8c05eead..92eedfa5 100644
--- a/modules/modtcl.cpp
+++ b/modules/modtcl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/modtcl/binds.tcl b/modules/modtcl/binds.tcl
index 5875cc69..faa688d9 100644
--- a/modules/modtcl/binds.tcl
+++ b/modules/modtcl/binds.tcl
@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2011  See the AUTHORS file for details.
+# Copyright (C) 2004-2012  See the AUTHORS file for details.
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 as published
diff --git a/modules/modtcl/modtcl.tcl b/modules/modtcl/modtcl.tcl
index c5964f09..254e43cb 100644
--- a/modules/modtcl/modtcl.tcl
+++ b/modules/modtcl/modtcl.tcl
@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2011  See the AUTHORS file for details.
+# Copyright (C) 2004-2012  See the AUTHORS file for details.
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 as published
diff --git a/modules/nickserv.cpp b/modules/nickserv.cpp
index a9a04d4a..f103a24c 100644
--- a/modules/nickserv.cpp
+++ b/modules/nickserv.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/notes.cpp b/modules/notes.cpp
index 85e41ca8..752ad627 100644
--- a/modules/notes.cpp
+++ b/modules/notes.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/partyline.cpp b/modules/partyline.cpp
index c77fb94b..faa1788b 100644
--- a/modules/partyline.cpp
+++ b/modules/partyline.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
@@ -123,8 +123,12 @@ public:
 
 	virtual EModRet OnDeleteUser(CUser& User) {
 		// Loop through each chan
-		for (set<CPartylineChannel*>::iterator it = m_ssChannels.begin(); it != m_ssChannels.end(); ++it) {
-			RemoveUser(&User, *it, "KICK", "User deleted", true);
+		for (set<CPartylineChannel*>::iterator it = m_ssChannels.begin(); it != m_ssChannels.end();) {
+			CPartylineChannel *pChan = *it;
+			// RemoveUser() might delete channels, so make sure our
+			// iterator doesn't break.
+			it++;
+			RemoveUser(&User, pChan, "KICK", "User deleted", true);
 		}
 
 		return CONTINUE;
diff --git a/modules/perform.cpp b/modules/perform.cpp
index 6315d36f..7a2016f4 100644
--- a/modules/perform.cpp
+++ b/modules/perform.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/q.cpp b/modules/q.cpp
index 66c4e36d..c21747d0 100644
--- a/modules/q.cpp
+++ b/modules/q.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2011  See the AUTHORS file for details.
+ * Copyright (C) 2008-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/raw.cpp b/modules/raw.cpp
index 7b845bbf..7a02c7e9 100644
--- a/modules/raw.cpp
+++ b/modules/raw.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/route_replies.cpp b/modules/route_replies.cpp
index 05f18181..b533a089 100644
--- a/modules/route_replies.cpp
+++ b/modules/route_replies.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/sample.cpp b/modules/sample.cpp
index a10db095..56e4741c 100644
--- a/modules/sample.cpp
+++ b/modules/sample.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/savebuff.cpp b/modules/savebuff.cpp
index cd0bfa15..ad5e30ee 100644
--- a/modules/savebuff.cpp
+++ b/modules/savebuff.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/schat.cpp b/modules/schat.cpp
index 61743ffc..d23dc631 100644
--- a/modules/schat.cpp
+++ b/modules/schat.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/simple_away.cpp b/modules/simple_away.cpp
index 8587401e..17f1d1dd 100644
--- a/modules/simple_away.cpp
+++ b/modules/simple_away.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/stickychan.cpp b/modules/stickychan.cpp
index 1c2a2645..150bfd09 100644
--- a/modules/stickychan.cpp
+++ b/modules/stickychan.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/watch.cpp b/modules/watch.cpp
index 37069c14..36283682 100644
--- a/modules/watch.cpp
+++ b/modules/watch.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/modules/webadmin.cpp b/modules/webadmin.cpp
index a4136cf0..d505a381 100644
--- a/modules/webadmin.cpp
+++ b/modules/webadmin.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 972ee473..9505486e 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/src/Chan.cpp b/src/Chan.cpp
index e2754e80..b507cb2e 100644
--- a/src/Chan.cpp
+++ b/src/Chan.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/src/Client.cpp b/src/Client.cpp
index a76559dc..42af382d 100644
--- a/src/Client.cpp
+++ b/src/Client.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/src/ClientCommand.cpp b/src/ClientCommand.cpp
index ca620c2d..02910907 100644
--- a/src/ClientCommand.cpp
+++ b/src/ClientCommand.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/src/Config.cpp b/src/Config.cpp
index 7538b72b..838803e6 100644
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/src/FileUtils.cpp b/src/FileUtils.cpp
index 02f56f8d..3a759ac3 100644
--- a/src/FileUtils.cpp
+++ b/src/FileUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/src/HTTPSock.cpp b/src/HTTPSock.cpp
index 79e017d6..1b83893e 100644
--- a/src/HTTPSock.cpp
+++ b/src/HTTPSock.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/src/IRCNetwork.cpp b/src/IRCNetwork.cpp
index 1071d9a0..893d52d2 100644
--- a/src/IRCNetwork.cpp
+++ b/src/IRCNetwork.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
@@ -181,8 +181,8 @@ CIRCNetwork::~CIRCNetwork() {
 	}
 
 	// Delete clients
-	for (vector<CClient*>::const_iterator it = m_vClients.begin(); it != m_vClients.end(); ++it) {
-		CZNC::Get().GetManager().DelSockByAddr(*it);
+	while (!m_vClients.empty()) {
+		CZNC::Get().GetManager().DelSockByAddr(m_vClients[0]);
 	}
 	m_vClients.clear();
 
@@ -252,6 +252,13 @@ bool CIRCNetwork::ParseConfig(CConfig *pConfig, CString& sError, bool bUpgrade)
 			CString sValue = *vit;
 			CString sModName = sValue.Token(0);
 
+			// XXX Legacy crap, added in ZNC 0.203
+			if (sModName == "away") {
+				CUtils::PrintMessage("NOTICE: [away] was renamed, "
+						"loading [autoaway] instead");
+				sModName = "autoaway";
+			}
+
 			CUtils::PrintAction("Loading Module [" + sModName + "]");
 			CString sModRet;
 			CString sArgs = sValue.Token(1, true);
diff --git a/src/IRCSock.cpp b/src/IRCSock.cpp
index 7534f488..9b2e9ea6 100644
--- a/src/IRCSock.cpp
+++ b/src/IRCSock.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/src/Listener.cpp b/src/Listener.cpp
index 287cf637..fcf1fd9b 100644
--- a/src/Listener.cpp
+++ b/src/Listener.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/src/Modules.cpp b/src/Modules.cpp
index 3fed2b12..ebac3e75 100644
--- a/src/Modules.cpp
+++ b/src/Modules.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/src/Nick.cpp b/src/Nick.cpp
index edd3667b..2b6640d2 100644
--- a/src/Nick.cpp
+++ b/src/Nick.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/src/Server.cpp b/src/Server.cpp
index 6df60a9a..d8d301f5 100644
--- a/src/Server.cpp
+++ b/src/Server.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/src/Socket.cpp b/src/Socket.cpp
index 60947bc7..1c926c40 100644
--- a/src/Socket.cpp
+++ b/src/Socket.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/src/Template.cpp b/src/Template.cpp
index d38948bb..ea164a62 100644
--- a/src/Template.cpp
+++ b/src/Template.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/src/User.cpp b/src/User.cpp
index 847501fa..85331b0f 100644
--- a/src/User.cpp
+++ b/src/User.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/src/Utils.cpp b/src/Utils.cpp
index 70610c9c..20632dcb 100644
--- a/src/Utils.cpp
+++ b/src/Utils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/src/WebModules.cpp b/src/WebModules.cpp
index b4670dfa..11b4606a 100644
--- a/src/WebModules.cpp
+++ b/src/WebModules.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/src/ZNCDebug.cpp b/src/ZNCDebug.cpp
index b609ec76..a78f7273 100644
--- a/src/ZNCDebug.cpp
+++ b/src/ZNCDebug.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/src/ZNCString.cpp b/src/ZNCString.cpp
index 7cd19382..7b01f15e 100644
--- a/src/ZNCString.cpp
+++ b/src/ZNCString.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/src/main.cpp b/src/main.cpp
index ec9c04b8..2aaa3cde 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/src/znc.cpp b/src/znc.cpp
index 949c5069..f403d5aa 100644
--- a/src/znc.cpp
+++ b/src/znc.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/test/ConfigTest.cpp b/test/ConfigTest.cpp
index 4102c51c..13673fca 100644
--- a/test/ConfigTest.cpp
+++ b/test/ConfigTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published
diff --git a/test/EscapeTest.cpp b/test/EscapeTest.cpp
index dc06aba0..ac46ac57 100644
--- a/test/EscapeTest.cpp
+++ b/test/EscapeTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011  See the AUTHORS file for details.
+ * Copyright (C) 2004-2012  See the AUTHORS file for details.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 as published