Merge branch 'stable'
authorKarl Hasselström <kha@treskal.com>
Tue, 8 Jul 2008 18:24:43 +0000 (20:24 +0200)
committerKarl Hasselström <kha@treskal.com>
Tue, 8 Jul 2008 18:26:47 +0000 (20:26 +0200)
commit7a6a45b5f1379466bd23b33a7feed47d0b8331b7
treeb0a5dcfce56a1fc43be737483b2a4c0abd4c43f7
parenta05954efcf4fce744252ce2e1a650b78fa5788d6
parenta6c4be12abcf0906a63de8a72c887c360f89ea82
Merge branch 'stable'

Conflicts:

stgit/commands/status.py
stgit/commands/status.py
stgit/git.py
t/t0002-status.sh