# HG changeset patch
# User Pascal Volk <user@localhost.localdomain.org>
# Date 1357430987 0
# Node ID 2bc11dada2965c633c2a40fbcd47239aa9c0a332
# Parent  995203a101e1e3f2c4aa800024ae5a72498cc414# Parent  d24f094d1cb5438385b7c7594061690add16d3a3
merged changes from default(d24f094d1cb5)

diff -r 995203a101e1 -r 2bc11dada296 COPYING
--- a/COPYING	Sat Jan 05 18:39:15 2013 +0000
+++ b/COPYING	Sun Jan 06 00:09:47 2013 +0000
@@ -1,4 +1,4 @@
-Copyright (c) 2007 - 2012, Pascal Volk
+Copyright (c) 2007 - 2013, Pascal Volk
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
diff -r 995203a101e1 -r 2bc11dada296 VirtualMailManager/__init__.py
--- a/VirtualMailManager/__init__.py	Sat Jan 05 18:39:15 2013 +0000
+++ b/VirtualMailManager/__init__.py	Sun Jan 06 00:09:47 2013 +0000
@@ -1,5 +1,5 @@
 # -*- coding: UTF-8 -*-
-# Copyright (c) 2007 - 2012, Pascal Volk
+# Copyright (c) 2007 - 2013, Pascal Volk
 # See COPYING for distribution information.
 """
     VirtualMailManager
diff -r 995203a101e1 -r 2bc11dada296 VirtualMailManager/account.py
--- a/VirtualMailManager/account.py	Sat Jan 05 18:39:15 2013 +0000
+++ b/VirtualMailManager/account.py	Sun Jan 06 00:09:47 2013 +0000
@@ -1,5 +1,5 @@
 # -*- coding: UTF-8 -*-
-# Copyright (c) 2007 - 2012, Pascal Volk
+# Copyright (c) 2007 - 2013, Pascal Volk
 # See COPYING for distribution information.
 """
     VirtualMailManager.account
diff -r 995203a101e1 -r 2bc11dada296 VirtualMailManager/alias.py
--- a/VirtualMailManager/alias.py	Sat Jan 05 18:39:15 2013 +0000
+++ b/VirtualMailManager/alias.py	Sun Jan 06 00:09:47 2013 +0000
@@ -1,5 +1,5 @@
 # -*- coding: UTF-8 -*-
-# Copyright (c) 2007 - 2012, Pascal Volk
+# Copyright (c) 2007 - 2013, Pascal Volk
 # See COPYING for distribution information.
 """
     VirtualMailManager.alias
diff -r 995203a101e1 -r 2bc11dada296 VirtualMailManager/aliasdomain.py
--- a/VirtualMailManager/aliasdomain.py	Sat Jan 05 18:39:15 2013 +0000
+++ b/VirtualMailManager/aliasdomain.py	Sun Jan 06 00:09:47 2013 +0000
@@ -1,5 +1,5 @@
 # -*- coding: UTF-8 -*-
-# Copyright (c) 2008 - 2012, Pascal Volk
+# Copyright (c) 2008 - 2013, Pascal Volk
 # See COPYING for distribution information.
 """
     VirtualMailManager.aliasdomain
diff -r 995203a101e1 -r 2bc11dada296 VirtualMailManager/cli/__init__.py
--- a/VirtualMailManager/cli/__init__.py	Sat Jan 05 18:39:15 2013 +0000
+++ b/VirtualMailManager/cli/__init__.py	Sun Jan 06 00:09:47 2013 +0000
@@ -1,5 +1,5 @@
 # -*- coding: UTF-8 -*-
-# Copyright (c) 2010 - 2012, Pascal Volk
+# Copyright (c) 2010 - 2013, Pascal Volk
 # See COPYING for distribution information.
 """
     VirtualMailManager.cli
diff -r 995203a101e1 -r 2bc11dada296 VirtualMailManager/cli/config.py
--- a/VirtualMailManager/cli/config.py	Sat Jan 05 18:39:15 2013 +0000
+++ b/VirtualMailManager/cli/config.py	Sun Jan 06 00:09:47 2013 +0000
@@ -1,5 +1,5 @@
 # -*- coding: UTF-8 -*-
-# Copyright (c) 2010 - 2012, Pascal Volk
+# Copyright (c) 2010 - 2013, Pascal Volk
 # See COPYING for distribution information.
 """
     VirtualMailManager.cli.config
diff -r 995203a101e1 -r 2bc11dada296 VirtualMailManager/cli/handler.py
--- a/VirtualMailManager/cli/handler.py	Sat Jan 05 18:39:15 2013 +0000
+++ b/VirtualMailManager/cli/handler.py	Sun Jan 06 00:09:47 2013 +0000
@@ -1,5 +1,5 @@
 # -*- coding: UTF-8 -*-
-# Copyright (c) 2010 - 2012, Pascal Volk
+# Copyright (c) 2010 - 2013, Pascal Volk
 # See COPYING for distribution information.
 """
     VirtualMailManager.cli.handler
diff -r 995203a101e1 -r 2bc11dada296 VirtualMailManager/cli/main.py
--- a/VirtualMailManager/cli/main.py	Sat Jan 05 18:39:15 2013 +0000
+++ b/VirtualMailManager/cli/main.py	Sun Jan 06 00:09:47 2013 +0000
@@ -1,5 +1,5 @@
 # -*- coding: UTF-8 -*-
-# Copyright (c) 2007 - 2012, Pascal Volk
+# Copyright (c) 2007 - 2013, Pascal Volk
 # See COPYING for distribution information.
 """
     VirtualMailManager.cli.main
diff -r 995203a101e1 -r 2bc11dada296 VirtualMailManager/cli/subcommands.py
--- a/VirtualMailManager/cli/subcommands.py	Sat Jan 05 18:39:15 2013 +0000
+++ b/VirtualMailManager/cli/subcommands.py	Sun Jan 06 00:09:47 2013 +0000
@@ -1,5 +1,5 @@
 # -*- coding: UTF-8 -*-
-# Copyright (c) 2007 - 2012, Pascal Volk
+# Copyright (c) 2007 - 2013, Pascal Volk
 # See COPYING for distribution information.
 """
     VirtualMailManager.cli.subcommands
diff -r 995203a101e1 -r 2bc11dada296 VirtualMailManager/common.py
--- a/VirtualMailManager/common.py	Sat Jan 05 18:39:15 2013 +0000
+++ b/VirtualMailManager/common.py	Sun Jan 06 00:09:47 2013 +0000
@@ -1,5 +1,5 @@
 # -*- coding: UTF-8 -*-
-# Copyright (c) 2010 - 2012, Pascal Volk
+# Copyright (c) 2010 - 2013, Pascal Volk
 # See COPYING for distribution information.
 """
     VirtualMailManager.common
diff -r 995203a101e1 -r 2bc11dada296 VirtualMailManager/config.py
--- a/VirtualMailManager/config.py	Sat Jan 05 18:39:15 2013 +0000
+++ b/VirtualMailManager/config.py	Sun Jan 06 00:09:47 2013 +0000
@@ -1,5 +1,5 @@
 # -*- coding: UTF-8 -*-
-# Copyright (c) 2007 - 2012, Pascal Volk
+# Copyright (c) 2007 - 2013, Pascal Volk
 # See COPYING for distribution information.
 """
     VirtualMailManager.config
diff -r 995203a101e1 -r 2bc11dada296 VirtualMailManager/constants.py
--- a/VirtualMailManager/constants.py	Sat Jan 05 18:39:15 2013 +0000
+++ b/VirtualMailManager/constants.py	Sun Jan 06 00:09:47 2013 +0000
@@ -1,5 +1,5 @@
 # -*- coding: UTF-8 -*-
-# Copyright (c) 2007 - 2012, Pascal Volk
+# Copyright (c) 2007 - 2013, Pascal Volk
 # See COPYING for distribution information.
 """
     VirtualMailManager.constants
@@ -18,7 +18,7 @@
 RELDATE = '2012-10-03'
 VERSION = '0.6.1'
 __author__ = AUTHOR
-__copyright__ = 'Copyright (c) 2007-2012 %s' % __author__
+__copyright__ = 'Copyright (c) 2007-2013 %s' % __author__
 __date__ = RELDATE
 __version__ = VERSION
 
diff -r 995203a101e1 -r 2bc11dada296 VirtualMailManager/domain.py
--- a/VirtualMailManager/domain.py	Sat Jan 05 18:39:15 2013 +0000
+++ b/VirtualMailManager/domain.py	Sun Jan 06 00:09:47 2013 +0000
@@ -1,5 +1,5 @@
 # -*- coding: UTF-8 -*-
-# Copyright (c) 2007 - 2012, Pascal Volk
+# Copyright (c) 2007 - 2013, Pascal Volk
 # See COPYING for distribution information.
 """
     VirtualMailManager.domain
diff -r 995203a101e1 -r 2bc11dada296 VirtualMailManager/emailaddress.py
--- a/VirtualMailManager/emailaddress.py	Sat Jan 05 18:39:15 2013 +0000
+++ b/VirtualMailManager/emailaddress.py	Sun Jan 06 00:09:47 2013 +0000
@@ -1,5 +1,5 @@
 # -*- coding: UTF-8 -*-
-# Copyright (c) 2008 - 2012, Pascal Volk
+# Copyright (c) 2008 - 2013, Pascal Volk
 # See COPYING for distribution information.
 """
     VirtualMailManager.emailaddress
diff -r 995203a101e1 -r 2bc11dada296 VirtualMailManager/errors.py
--- a/VirtualMailManager/errors.py	Sat Jan 05 18:39:15 2013 +0000
+++ b/VirtualMailManager/errors.py	Sun Jan 06 00:09:47 2013 +0000
@@ -1,5 +1,5 @@
 # -*- coding: UTF-8 -*-
-# Copyright (c) 2007 - 2012, Pascal Volk
+# Copyright (c) 2007 - 2013, Pascal Volk
 # See COPYING for distribution information.
 """
     VirtualMailManager.errors
diff -r 995203a101e1 -r 2bc11dada296 VirtualMailManager/ext/__init__.py
--- a/VirtualMailManager/ext/__init__.py	Sat Jan 05 18:39:15 2013 +0000
+++ b/VirtualMailManager/ext/__init__.py	Sun Jan 06 00:09:47 2013 +0000
@@ -1,5 +1,5 @@
 # -*- coding: UTF-8 -*-
-# Copyright (c) 2008 - 2012, Pascal Volk
+# Copyright (c) 2008 - 2013, Pascal Volk
 # See COPYING for distribution information.
 # package placeholder
 #
diff -r 995203a101e1 -r 2bc11dada296 VirtualMailManager/ext/postconf.py
--- a/VirtualMailManager/ext/postconf.py	Sat Jan 05 18:39:15 2013 +0000
+++ b/VirtualMailManager/ext/postconf.py	Sun Jan 06 00:09:47 2013 +0000
@@ -1,5 +1,5 @@
 # -*- coding: UTF-8 -*-
-# Copyright (c) 2008 - 2012, Pascal Volk
+# Copyright (c) 2008 - 2013, Pascal Volk
 # See COPYING for distribution information.
 """
     VirtualMailManager.ext.postconf
diff -r 995203a101e1 -r 2bc11dada296 VirtualMailManager/handler.py
--- a/VirtualMailManager/handler.py	Sat Jan 05 18:39:15 2013 +0000
+++ b/VirtualMailManager/handler.py	Sun Jan 06 00:09:47 2013 +0000
@@ -1,5 +1,5 @@
 # -*- coding: UTF-8 -*-
-# Copyright (c) 2007 - 2012, Pascal Volk
+# Copyright (c) 2007 - 2013, Pascal Volk
 # See COPYING for distribution information.
 """
    VirtualMailManager.handler
diff -r 995203a101e1 -r 2bc11dada296 VirtualMailManager/mailbox.py
--- a/VirtualMailManager/mailbox.py	Sat Jan 05 18:39:15 2013 +0000
+++ b/VirtualMailManager/mailbox.py	Sun Jan 06 00:09:47 2013 +0000
@@ -1,5 +1,5 @@
 # -*- coding: UTF-8 -*-
-# Copyright (c) 2010 - 2012, Pascal Volk
+# Copyright (c) 2010 - 2013, Pascal Volk
 # See COPYING for distribution information.
 """
     VirtualMailManager.mailbox
diff -r 995203a101e1 -r 2bc11dada296 VirtualMailManager/maillocation.py
--- a/VirtualMailManager/maillocation.py	Sat Jan 05 18:39:15 2013 +0000
+++ b/VirtualMailManager/maillocation.py	Sun Jan 06 00:09:47 2013 +0000
@@ -1,5 +1,5 @@
 # -*- coding: UTF-8 -*-
-# Copyright (c) 2008 - 2012, Pascal Volk
+# Copyright (c) 2008 - 2013, Pascal Volk
 # See COPYING for distribution information.
 """
     VirtualMailManager.maillocation
diff -r 995203a101e1 -r 2bc11dada296 VirtualMailManager/network.py
--- a/VirtualMailManager/network.py	Sat Jan 05 18:39:15 2013 +0000
+++ b/VirtualMailManager/network.py	Sun Jan 06 00:09:47 2013 +0000
@@ -1,5 +1,5 @@
 # -*- coding: UTF-8 -*-
-# Copyright (c) 2011 - 2012, Pascal Volk
+# Copyright (c) 2011 - 2013, Pascal Volk
 # See COPYING for distribution information.
 """
     VirtualMailManager.network
diff -r 995203a101e1 -r 2bc11dada296 VirtualMailManager/password.py
--- a/VirtualMailManager/password.py	Sat Jan 05 18:39:15 2013 +0000
+++ b/VirtualMailManager/password.py	Sun Jan 06 00:09:47 2013 +0000
@@ -1,5 +1,5 @@
 # -*- coding: UTF-8 -*-
-# Copyright (c) 2010 - 2012, Pascal Volk
+# Copyright (c) 2010 - 2013, Pascal Volk
 # See COPYING for distribution information.
 """
     VirtualMailManager.password
diff -r 995203a101e1 -r 2bc11dada296 VirtualMailManager/quotalimit.py
--- a/VirtualMailManager/quotalimit.py	Sat Jan 05 18:39:15 2013 +0000
+++ b/VirtualMailManager/quotalimit.py	Sun Jan 06 00:09:47 2013 +0000
@@ -1,5 +1,5 @@
 # -*- coding: UTF-8 -*-
-# Copyright (c) 2011 - 2012, Pascal Volk
+# Copyright (c) 2011 - 2013, Pascal Volk
 # See COPYING for distribution information.
 """
     VirtualMailManager.quotalimit
diff -r 995203a101e1 -r 2bc11dada296 VirtualMailManager/relocated.py
--- a/VirtualMailManager/relocated.py	Sat Jan 05 18:39:15 2013 +0000
+++ b/VirtualMailManager/relocated.py	Sun Jan 06 00:09:47 2013 +0000
@@ -1,5 +1,5 @@
 # -*- coding: UTF-8 -*-
-# Copyright (c) 2008 - 2012, Pascal Volk
+# Copyright (c) 2008 - 2013, Pascal Volk
 # See COPYING for distribution information.
 """
     VirtualMailManager.relocated
diff -r 995203a101e1 -r 2bc11dada296 VirtualMailManager/serviceset.py
--- a/VirtualMailManager/serviceset.py	Sat Jan 05 18:39:15 2013 +0000
+++ b/VirtualMailManager/serviceset.py	Sun Jan 06 00:09:47 2013 +0000
@@ -1,5 +1,5 @@
 # coding: utf-8
-# Copyright (c) 2011 - 2012, Pascal Volk
+# Copyright (c) 2011 - 2013, Pascal Volk
 # See COPYING for distribution information.
 """
     VirtualMailManager.serviceset
diff -r 995203a101e1 -r 2bc11dada296 VirtualMailManager/transport.py
--- a/VirtualMailManager/transport.py	Sat Jan 05 18:39:15 2013 +0000
+++ b/VirtualMailManager/transport.py	Sun Jan 06 00:09:47 2013 +0000
@@ -1,5 +1,5 @@
 # -*- coding: UTF-8 -*-
-# Copyright (c) 2008 - 2012, Pascal Volk
+# Copyright (c) 2008 - 2013, Pascal Volk
 # See COPYING for distribution information.
 """
     VirtualMailManager.transport
diff -r 995203a101e1 -r 2bc11dada296 setup.py
--- a/setup.py	Sat Jan 05 18:39:15 2013 +0000
+++ b/setup.py	Sun Jan 06 00:09:47 2013 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-# Copyright 2007 - 2012, Pascal Volk
+# Copyright 2007 - 2013, Pascal Volk
 # See COPYING for distribution information.
 
 import os
diff -r 995203a101e1 -r 2bc11dada296 update_config.py
--- a/update_config.py	Sat Jan 05 18:39:15 2013 +0000
+++ b/update_config.py	Sun Jan 06 00:09:47 2013 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: UTF-8 -*-
-# Copyright (c) 2008 - 2012, Pascal Volk
+# Copyright (c) 2008 - 2013, Pascal Volk
 # See COPYING for distribution information.
 
 import os
diff -r 995203a101e1 -r 2bc11dada296 vmm
--- a/vmm	Sat Jan 05 18:39:15 2013 +0000
+++ b/vmm	Sun Jan 06 00:09:47 2013 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: UTF-8 -*-
-# Copyright 2007 - 2012, Pascal Volk
+# Copyright 2007 - 2013, Pascal Volk
 # See COPYING for distribution information.
 
 """This is the vmm main script."""