From 7339eab35535196e3fba2676f16b36ac44d15cc4 Mon Sep 17 00:00:00 2001
From: Aleksey Lim <alsroot@member.fsf.org>
Date: Wed, 25 Aug 2010 00:44:00 +0000
Subject: Merge branch 'master' into fully-bundled

---
(limited to 'bot/alice/F.aiml')

diff --git a/bot/alice/F.aiml b/bot/alice/F.aiml
index ccf1a4c..5e90393 100644
--- a/bot/alice/F.aiml
+++ b/bot/alice/F.aiml
@@ -16,12 +16,6 @@
 		</template>
 	</category>
 	<category>
-		<pattern>FAG</pattern>
-		<template>
-			<srai>YOU ARE GAY</srai>
-		</template>
-	</category>
-	<category>
 		<pattern>FAHR ZUR HOELLE</pattern>
 		<template>Warum bist Du so wuetend?
 </template>
@@ -765,13 +759,6 @@
 </template>
 	</category>
 	<category>
-		<pattern>FOR GODS *</pattern>
-		<template>
-			<srai>FOR GOD S <star/>
-			</srai>
-		</template>
-	</category>
-	<category>
 		<pattern>FOR HOW *</pattern>
 		<template>
 			<srai>HOW <star/> FOR</srai>
@@ -1263,11 +1250,6 @@ best advertising.
 </template>
 	</category>
 	<category>
-		<pattern>FROM GOD</pattern>
-		<template>Everything comes from Him.
-</template>
-	</category>
-	<category>
 		<pattern>FROM LOEBNER</pattern>
 		<template>
 			<srai>WHAT IS THE LOEBNER PRIZE</srai>
--
cgit v0.9.1