]> arthur.barton.de Git - ngircd.git/commitdiff
Merge branch 'master' into branch-0-12-x
authorAlexander Barton <alex@barton.de>
Tue, 29 Apr 2008 12:41:24 +0000 (14:41 +0200)
committerAlexander Barton <alex@barton.de>
Tue, 29 Apr 2008 12:41:24 +0000 (14:41 +0200)

Trivial merge