Merge branch 'mc-4.6'

Conflicts: ChangeLog
2009-01-12 21:29:30 +01:00 · 2009-01-12 21:29:30 +01:00 · 2fa781eeeb
--- a/4
+++ b/4
@ -21,7 +21,9 @@ Pavel Machek <pavel@ucw.cz>
 Pavel Roskin <proski@gnu.org>
 Radek Doulik <rodo@ucw.cz>
 Roland Illig <roland.illig@gmx.de>
-
+Enrico Weigelt <weigelt@metux.de>
+Patrick Winnertz <winnie@debian.org>
+Slava Zanko <slavazanko@gmail.com>

 Contributors:
 =============
--- a/5
+++ b/5
@ -1,3 +1,8 @@
+2009-01-12 Patrick Winnertz <winnie@debian.org>
+  
+	* AUTHORS: Added Enrico Weigelt, Slava Zanko and 
+	Patrick Winnertz as authors 
+
 2009-01-11 Enrico Weigelt, metux ITS <weigelt@metux.de>

 	* FAQ HACKING README man/*: new HQ url