Merge branch 'stable'
authorCatalin Marinas <catalin.marinas@gmail.com>
Wed, 28 Jan 2009 23:07:37 +0000 (23:07 +0000)
committerCatalin Marinas <catalin.marinas@gmail.com>
Wed, 28 Jan 2009 23:07:37 +0000 (23:07 +0000)
commitbaf8241d1b7835ba31125d2b75683601ee2b0403
tree6170d11420d8ee9d902e066e86619378e6753cd9
parente799c7fa7f55b27d78f5bccdddb86f78260bf955
parent641d287da88f80171cce28d14fa06f139e40c177
Merge branch 'stable'

Conflicts:
stgit/commands/files.py
stgit/commands/mail.py
stgit/git.py
stgit/commands/files.py
stgit/commands/mail.py