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 'activity')

--
cgit v0.9.1