Merge branch 'stable'
authorCatalin Marinas <catalin.marinas@gmail.com>
Sun, 8 Jun 2008 23:15:21 +0000 (00:15 +0100)
committerCatalin Marinas <catalin.marinas@gmail.com>
Sun, 8 Jun 2008 23:15:21 +0000 (00:15 +0100)
Conflicts:

stgit/version.py


Trivial merge