From eda1fca43e1712e7fc0bc2deb5adaa4b898eafe3 Mon Sep 17 00:00:00 2001
From: "Robin Burchell w00t@inspircd.org"
 <Robin Burchell w00t@inspircd.org@5417fbe8-f217-4b02-8779-1006273d7864>
Date: Mon, 3 Nov 2008 00:01:19 +0000
Subject: Merge commit 'trunk' into anopeng (1.8 updates, etc)

Conflicts:

	src/main.c
	src/mysql.c
	version.log


git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1504 5417fbe8-f217-4b02-8779-1006273d7864
---
 docs/README | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'docs/README')

diff --git a/docs/README b/docs/README
index 3344482db..fb238f450 100644
--- a/docs/README
+++ b/docs/README
@@ -74,6 +74,8 @@ Table of Contents
 
         * Adam Kramer <ribosome@anope.org>
         * Alvaro Toledo <atoledo@keldon.org>
+        * Amanda Folson <amanda@anope.org>
+        * Andrew Berquist <vash@anope.org> 
         * Björn Stiddien <keeper@anope.org>
         * Charles Kingsley <chaz@anope.org>
         * Chris Hogben <heinz@anope.org>
@@ -89,6 +91,7 @@ Table of Contents
         * Joris Vink <joris@anope.org>
         * Lucas Nussbaum <lucas@lucas-nussbaum.net>
         * Mark Summers <mark@goopler.net>
+        * Matthew Beeching <jobe@invictachat.net>
         * Pieter Bootsma <geniusdex@anope.org>
         * Thomas Juberg Stensås <ShadowMaster@Shadow-Realm.org>
         * Trystan .S Lee <trystan@nomadirc.net>
@@ -97,12 +100,11 @@ Table of Contents
     Anope Translations:
 
         * GeniusDex <geniusdex@anope.org> (nl.l)
-        * Oleg Nikolaev aka Isot <isot@complife.ru> (ru.l)
+        * Kein <kein-of@yandex.ru> (ru.l)
         * Stuff <the.stuff@gmx.de> (de.l)
         * Gabriel Acevedo H. <drstein@anope.org> (es.l)
         * Janos Kapitany <sarkanyka@cjbchat.hu>  (hun.l)
-        * Mateusz Szczyrzyca <annihilator@ircnet.pl> (pl.l)
-
+        * Szymon S'wierkosz <szymek@adres.pl> (pl.l)
 
     Anope uses the strlcat() and strlcpy() functions from OpenSSH 2.5.1p2.
     These functions are copyrighted by Todd C. Miller:
-- 
cgit