From b104f1e11ebb711869dbe55a374c96f7b2cd0a5f Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <mpg@redhat.com>
Date: Mon, 03 Sep 2007 21:09:56 +0000
Subject: Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar

Conflicts:

	NEWS
---
(limited to 'NEWS')

diff --git a/NEWS b/NEWS
index 1da917c..2d785d4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,5 @@
 * #3025: Make bundlebuilder work even if SUGAR_PREFIX is not set. (marco)
+* #2896: Remove sugar.date module. (tomeu)
 
 Snapshot 0b3f687749
 
--
cgit v0.9.1