From: Karl Hasselström <kha@treskal.com>
Date: Sun, 29 Jun 2008 22:47:50 +0000 (+0200)
Subject: Merge branch 'stable' into stable-master-merge
X-Git-Tag: v0.15-rc1~204
X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/commitdiff_plain/a05954efcf4fce744252ce2e1a650b78fa5788d6

Merge branch 'stable' into stable-master-merge
---

a05954efcf4fce744252ce2e1a650b78fa5788d6