Merge branch 'new_gpg' into new_gpg_autoexchangenew_gpg_autoexchange

Conflicts:
	main.cpp
	messages.cpp

1 files changed, 1 insertions, 1 deletions

diff --git a/main.h b/main.h
index e4ff5f2..23627a4 100644..100755
--- a/main.h
+++ b/main.h
@@ -1,4 +1,4 @@
-// Copyright © 2010 sss

+// Copyright © 2010-2012 sss

 // 

 // This program is free software; you can redistribute it and/or

 // modify it under the terms of the GNU General Public License