Merge branch 'ZNCv1' into MixedVersions
authorpk910 <philipp@zoelle1.de>
Sat, 29 Jun 2013 22:37:32 +0000 (00:37 +0200)
committerpk910 <philipp@zoelle1.de>
Sat, 29 Jun 2013 22:37:32 +0000 (00:37 +0200)
commit35d6cfed78a76d9cf7a679faba96df2ccc40a111
treedb588eda0ec14f782be34d7eb4bb9859fde0dd64
parentaf798c5febaeefd3cb1378438442522eaae8285f
parent100badeff083ddab81ffe5f4697109c2b31612d6
Merge branch 'ZNCv1' into MixedVersions
zncadmin/ZNCServer.class.php
zncadmin/ZNCServerV1.class.php