Merge branch 'master' of ssh://git.pk910.de:16110/ZNCAdmin
authorpk910 <philipp@zoelle1.de>
Mon, 12 Aug 2013 20:47:10 +0000 (22:47 +0200)
committerpk910 <philipp@zoelle1.de>
Mon, 12 Aug 2013 20:47:10 +0000 (22:47 +0200)

Trivial merge