Merge branch 'ZNCv1' of ssh://git.pk910.de:16110/ZNCAdmin into ZNCv1
authorNurPech <nurpech@nurpech.de>
Sun, 27 Jan 2013 14:32:45 +0000 (15:32 +0100)
committerNurPech <nurpech@nurpech.de>
Sun, 27 Jan 2013 14:33:11 +0000 (15:33 +0100)

Trivial merge