From d459a3b2d72cf2ef8dbca1c6e73f9e06c123adc1 Mon Sep 17 00:00:00 2001
From: brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>
Date: Thu, 11 Oct 2007 21:23:33 +0000
Subject: [PATCH] SVNMERGE BLOCK:
 8074,8079-8080,8082-8083,8088-8089,8097-8098,8101-8103,8107,8109-8112,8115-8118,8121-8127,8129-8130,8144-8145,8147

git-svn-id: http://svn.inspircd.org/repository/branches/1_1_stable@8148 e03df62e-2008-0410-955e-edbf42e46eb7