From: Karl Hasselström <kha@treskal.com>
Date: Tue, 8 Jul 2008 18:24:43 +0000 (+0200)
Subject: Merge branch 'stable'
X-Git-Tag: v0.15-rc1~203
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/commitdiff_plain/7a6a45b5f1379466bd23b33a7feed47d0b8331b7?ds=inline;hp=7a6a45b5f1379466bd23b33a7feed47d0b8331b7

Merge branch 'stable'

Conflicts:

	stgit/commands/status.py
---