diff NEWS @ 9384:9bfd0e336c91

[gaim-migrate @ 10192] lets have a release! committer: Tailor Script <[e-mail]>

--- a/NEWS	Thu Jun 24 23:13:22 2004 +0000
+++ b/NEWS	Thu Jun 24 23:14:55 2004 +0000
@@ -8,10 +8,17 @@
 	they'll continue to try to break us, though, so don't be surprised
 	if your Yahoo cuts out again.
 
+	Luke: I was really distracted this cycle, I want to thank my co-
+	developers and our crazy patch writters for keeping things going.
+	We have a fairly long changelog for you this release, including some
+	nice bug fixes and some much-requested new features, the ChangeLog
+	has all the details there of course. Enjoy!
+
 	Christian: Great release! MSN buddy icons and file transfer. A big round
 	of applause to Felipe! To bad about the Yahoo thing, but.. eep! I have
 	to go! Movie with the girls and Farmer's Market.
 
+>>>>>>> 1.255
 0.78 (05/30/2004):
 	Luke: A very long time, once again, since the last release. I think
 	its mostly worth it. A few of you will still have trouble with msn