| commit | 9aeeb26bb23a8a0f9be04921a77f258ab87eb9d8 | |
| author | Robin H. Johnson <robbat2@gentoo.org> | |
| Fri, 10 Sep 2010 18:51:54 +0000 (10 18:51 +0000) | ||
| committer | Robin H. Johnson <robbat2@gentoo.org> | |
| Fri, 10 Sep 2010 18:51:54 +0000 (10 18:51 +0000) | ||
| tree | d10a4030b731cae3f7ad12c90b4704850ffc2a20 | treesnapshot (tar.gz zip) |
| parent | 9f39956b8b10e4952cdf0efb8462efd55c71926b | commitdiff |
| parent | dedb3dc63f413ed6eeba8082b7e93ad136b16d0d | commitdiff |
Merge branch 'upstream' into gentoo
Conflicts:
gitosis/test/test_repository.py
gitosis/test/test_serve.py
Conflicts:
gitosis/test/test_repository.py
gitosis/test/test_serve.py
| gitosis/serve.py | diff1 | diff2 | blobhistory |
| gitosis/test/test_repository.py | diff1 | diff2 | blobhistory |
| gitosis/test/test_serve.py | diff1 | diff2 | blobhistory |