Merge branch 'master' into HostServ
authorpk910 <philipp@zoelle1.de>
Tue, 8 Jan 2013 02:59:14 +0000 (03:59 +0100)
committerpk910 <philipp@zoelle1.de>
Tue, 8 Jan 2013 02:59:14 +0000 (03:59 +0100)
commit4599399814ff56c24895b773104998485d781445
treede6d4d1a7c9684b3940ab27d8de9980cf03a5761
parent869edf2c778550b4fb5ffca23311736ddc790d0d
parent6ad7e65ad5121cd1ad3f2f19c7e9a9912cfa44f0
Merge branch 'master' into HostServ
src/nickserv.c