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)
commitd926892f4f058326d8e7efc61f7ae4f54b8a02b2
tree826003f6bc0115c541a43e656be702fef690a60a
parentf26b503649c4e249201c9ae09b0705e8ed24a949
parentc45b4c79f5a9e99ba0962b1f095e110dc2563526
Merge branch 'stable'

Conflicts:

stgit/version.py