Merge branch 'mc-4.6'

Conflicts:
	ChangeLog
This commit is contained in:
Patrick Winnertz 2009-01-12 21:29:30 +01:00
commit 2fa781eeeb
2 changed files with 8 additions and 1 deletions

View File

@ -21,7 +21,9 @@ Pavel Machek <pavel@ucw.cz>
Pavel Roskin <proski@gnu.org> Pavel Roskin <proski@gnu.org>
Radek Doulik <rodo@ucw.cz> Radek Doulik <rodo@ucw.cz>
Roland Illig <roland.illig@gmx.de> Roland Illig <roland.illig@gmx.de>
Enrico Weigelt <weigelt@metux.de>
Patrick Winnertz <winnie@debian.org>
Slava Zanko <slavazanko@gmail.com>
Contributors: Contributors:
============= =============

View File

@ -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> 2009-01-11 Enrico Weigelt, metux ITS <weigelt@metux.de>
* FAQ HACKING README man/*: new HQ url * FAQ HACKING README man/*: new HQ url