Merge branch 'stable'
authorCatalin Marinas <catalin.marinas@gmail.com>
Tue, 27 May 2008 22:18:22 +0000 (23:18 +0100)
committerCatalin Marinas <catalin.marinas@gmail.com>
Tue, 27 May 2008 22:18:22 +0000 (23:18 +0100)
commit78e5af69d99659769b052e4c00fe5b23a8356231
treebf1ae1bc2a58aea57ef3722d4b10de38e7a97ee5
parenta5920051ee4326489c4b43e85d93f71d4c4ce34a
parent466bfe50d7930bca950ca2b3436f1278a6b15af5
Merge branch 'stable'

Conflicts:

t/t2700-refresh.sh
stgit/git.py
t/t2700-refresh.sh