From a2431740a2ed42b2a2f71977a643169aaf2cecdf Mon Sep 17 00:00:00 2001
From: Simon Schampijer <simon@schampijer.de>
Date: Sun, 14 Oct 2007 18:58:48 +0000
Subject: Merge branch 'master' of git+ssh://dev.laptop.org/git/web-activity

Conflicts:

	downloadmanager.py
---
(limited to 'webactivity.py')

--
cgit v0.9.1