From: Ben Hutchings <ben@decadent.org.uk>
Date: Sun, 9 Nov 2008 14:24:57 +0000 (+0000)
Subject: Merge branch 'upstream'
X-Git-Url: https://git.decadent.org.uk/gitweb/?p=maypole.git;a=commitdiff_plain;h=ccffaddb7564c652448befe4d67d0ae5276d8975

Merge branch 'upstream'
---

ccffaddb7564c652448befe4d67d0ae5276d8975