From 6ae5e4111a76f9cb8f59ae6dfc9123365df39467 Mon Sep 17 00:00:00 2001
From: Simon Schampijer <simon@schampijer.de>
Date: Sat, 01 Sep 2007 09:11:36 +0000
Subject: Merge branch 'master' into json

Conflicts:

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

--
cgit v0.9.1