# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1229659950 0
# Node ID c7d11c2673cc822d3fdbb3b3cca035f69e433e34
# Parent  e7b27ee5e7b6598f64a70d469eba5a905ec2afc0# Parent  a3ff72aa9c393bbb0a5882d1d74eb1264ba34430
merge of '5dc6f2359f155e18525e7b42ecd827005e473725'
     and 'c2ac5fa50fc703703cc562bb7f7e4baf62d91fa3'

diff -r e7b27ee5e7b6 -r c7d11c2673cc NEWS
--- a/NEWS	Fri Dec 19 04:11:15 2008 +0000
+++ b/NEWS	Fri Dec 19 04:12:30 2008 +0000
@@ -19,6 +19,9 @@
 	admit.  By my count, our ChangeLog has 58 bullet points(!) and we've
 	closed 85 tickets specifically for this release.  Enjoy!
 
+    Ka-Hing: Bring your XMPP server to 2008 some time in 2009 would be
+    nice, DreamHost!
+
 2.5.2 (10/19/2008):
 	Ethan: After a bit of a struggle with our services, which put
 	this release off for an unfortunate length of time, we're