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)
commitfbde9a30ca3827c5089dc6a64c99028d7065581e
tree4929c0ca1b78926cb6539d684b127a6c04372173
parentfceb02a206272b75084ca5190c4d3d4fbb497826
parentd501779e3cfaa37bbcc6e4235902de4e53833bb2
Merge branch 'master' of ssh://git.pk910.de:16110/ZNCAdmin