From: Karl Hasselström <kha@treskal.com>
Date: Wed, 23 Jul 2008 21:24:57 +0000 (+0200)
Subject: Merge branch 'stable'
X-Git-Tag: v0.15-rc1~199
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/commitdiff_plain/d756053f114b1fdf46c2694e940f1197822afcc7?hp=d756053f114b1fdf46c2694e940f1197822afcc7

Merge branch 'stable'

Conflicts:

	setup.py
---