From 114f2e7489135d2495fc77a9437a668e640fe624 Mon Sep 17 00:00:00 2001
From: Simon Schampijer <simon@schampijer.de>
Date: Mon, 21 Jan 2008 14:48:53 +0000
Subject: Merge branch 'update-1' of ssh+git://dev.laptop.org/git/web-activity into update-1

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

--
cgit v0.9.1