Merge branch 'upstream' into gentoo
commitf275a5f74bd00efa5a9b4b80826d18c9d7442ff9
authorRobin H. Johnson <robbat2@gentoo.org>
Tue, 28 Oct 2008 10:37:28 +0000 (28 03:37 -0700)
committerRobin H. Johnson <robbat2@gentoo.org>
Tue, 28 Oct 2008 10:37:28 +0000 (28 03:37 -0700)
treed4b1b029f2ad1632bd64162a2cdf61b73c658378
parent800ac5b58a60de070a10cafce609f28fc2905691
parent73a032520493f6b4186185d4826d12edb5614135
Merge branch 'upstream' into gentoo

Conflicts:
gitosis/run_hook.py
gitosis/serve.py
gitosis/test/test_run_hook.py
gitosis/test/test_serve.py
gitosis/group.py
gitosis/serve.py
gitosis/test/test_serve.py