From d577566151c7dd7287d5609730861b006158b1e4 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <marco@localhost.localdomain>
Date: Fri, 09 Nov 2007 16:38:09 +0000
Subject: Merge branch 'master' of git+ssh://marco@dev.laptop.org/git/sugar

Conflicts:

	NEWS
---
(limited to 'NEWS')

diff --git a/NEWS b/NEWS
index b689c52..5dc2c15 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,6 @@
 * #4687 Use the right free function, fix a crash. (sjoerd)
+* #4724 Display meshbox invite palette menu with colored
+  activity icon (erikos)
 * Always checkin to the DS from a new file. (tomeu)
 
 Snapshot c682a5e241
--
cgit v0.9.1