From 502b3321716ff063e1992c35cb28483da48b0dd6 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <mpg@redhat.com>
Date: Fri, 12 Oct 2007 21:10:57 +0000
Subject: Merge branch 'master' of git+ssh://dev.laptop.org/git/web-activity

Conflicts:

	NEWS
	browser.py
---
(limited to 'activity')

--
cgit v0.9.1