From: Karl Hasselström <kha@treskal.com>
Date: Tue, 3 Jun 2008 00:43:24 +0000 (+0200)
Subject: Merge branch 'stable' into stable-master-merge
X-Git-Tag: v0.15-rc1~217^2~2
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/commitdiff_plain/9b4a6e70a1390d653201e48e12d09005b3fba6c8?hp=9b4a6e70a1390d653201e48e12d09005b3fba6c8

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