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)
commitcced27e977fdcc139c44480981d9a55feb396c51
tree77060a205ac92adf9b1af55dffff8281a1d9b6c2
parent5778af48a7195e90e99bbdf9ea3edba989473e3d
parentb35aabd3a108d88fb6c64319c42a19d0d49a7d15
Merge branch 'ZNCv1' of ssh://git.pk910.de:16110/ZNCAdmin into ZNCv1