From 131c791f15992ecaf6960ba8d90e0e106468fa5e Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <mpg@redhat.com>
Date: Mon, 03 Sep 2007 14:28:45 +0000
Subject: Merge branch 'master' of git+ssh://dev.laptop.org/git/web-activity

Conflicts:

	NEWS
---
(limited to 'NEWS')

diff --git a/NEWS b/NEWS
index 3db5efa..e309a06 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,6 @@
 * #2327 Unescape the URI to display it in the address bar (marco)
+* fixed memory consuption when creating shared links 
+  by calling the garbage collector (erikos)
 
 45
 
--
cgit v0.9.1