]> jfr.im git - irc/rizon/znc.git/commitdiff
Merge branch 'master' of git://github.com/znc/znc into bugfix/white_space_edition
authorUn1matr1x <redacted>
Wed, 8 Jun 2011 04:47:46 +0000 (06:47 +0200)
committerUn1matr1x <redacted>
Wed, 8 Jun 2011 04:47:46 +0000 (06:47 +0200)

Trivial merge