From 2a354fb8961e934f90889c5d3f0be84fb91d5b5b Mon Sep 17 00:00:00 2001
From: Simon Schampijer <simon@schampijer.de>
Date: Thu, 06 Sep 2007 15:15:24 +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 a508985..31b1f38 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,5 @@
 * Added missing fill_color in icon (erikos)
+* #2555: Report download progress to the Journal via the DataStore. (tomeu)
 
 48
 
--
cgit v0.9.1