Merge branch 'master' of git://github.com/zts/Gitalist into zts-patches
authorDan Brook <broq@cpan.org>
Thu, 19 Nov 2009 18:49:16 +0000 (18:49 +0000)
committerDan Brook <broq@cpan.org>
Thu, 19 Nov 2009 18:49:16 +0000 (18:49 +0000)
commitf9c75555db463f4e1db60bf7d7b2e505c779ed13
tree3dc0685229c493caf4beaed75403fcce59b78b75
parentf796a86151f0c1237610564cbb3e5fd7ae3a6c47
parent8bfa1d9485512aebe4b8d8b11d9c0f595937d88b
Merge branch 'master' of git://github.com/zts/Gitalist into zts-patches

Conflicts:
lib/Gitalist/Controller/Root.pm
lib/Gitalist/Controller/Root.pm
t/03legacy_uri.t