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 'NEWS')

diff --git a/NEWS b/NEWS
index 47a1803..0ce964d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+18
+
+* Remove content from AIML sets that is inappropriate to education
+
 17
 
 * Get rid of "smart" bundles(for ASLO).. and look ahead for smart packaging system
--
cgit v0.9.1