From 6726081a4fe2c62ab255b76d184c2f083ba4ba6e Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <marco@localhost.localdomain>
Date: Fri, 13 Jun 2008 15:11:53 +0000
Subject: Merge branch 'master' of git+ssh://dev.laptop.org/git/web-activity

Conflicts:

	webtoolbar.py
---
(limited to 'NEWS')

--
cgit v0.9.1