From: Catalin Marinas <catalin.marinas@gmail.com>
Date: Sun, 8 Jun 2008 23:15:21 +0000 (+0100)
Subject: Merge branch 'stable'
X-Git-Tag: v0.15-rc1~209
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/commitdiff_plain/d926892f4f058326d8e7efc61f7ae4f54b8a02b2

Merge branch 'stable'

Conflicts:

	stgit/version.py
---

d926892f4f058326d8e7efc61f7ae4f54b8a02b2