From 22c2741e438dce660b83795564968146dbddfda6 Mon Sep 17 00:00:00 2001
From: Simon Schampijer <simon@schampijer.de>
Date: Fri, 13 Jun 2008 11:03:00 +0000
Subject: Merge branch 'master' of ssh+git://dev.laptop.org/git/web-activity

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

--
cgit v0.9.1