]> arthur.barton.de Git - ngircd-web.git/commitdiff
Merge branch 'master' of /srv/git/ngircd-web
authorAlexander Barton <alex@barton.de>
Sun, 25 Apr 2010 13:34:04 +0000 (15:34 +0200)
committerAlexander Barton <alex@barton.de>
Sun, 25 Apr 2010 13:34:04 +0000 (15:34 +0200)

Trivial merge