Merge remote branch 't0m/json' into json
authorDan Brook <broq@cpan.org>
Sun, 2 May 2010 19:06:51 +0000 (20:06 +0100)
committerDan Brook <broq@cpan.org>
Sun, 2 May 2010 19:06:51 +0000 (20:06 +0100)
commit68943a848e5fae4bd91569b930ddcdcecc6dfe9b
treeacc6bf2f6bb1b0146c37c1c55ec0bc001d4df6a6
parent0fa199d20f9c661f21ced401be8dc12e0e93ecdd
parent68b525fcc3c5788eef526ebb643746317a10372b
Merge remote branch 't0m/json' into json

Conflicts:
Makefile.PL
lib/Gitalist/Controller/Root.pm
lib/Gitalist/Git/Repository.pm
Makefile.PL
lib/Gitalist/Controller/Root.pm
lib/Gitalist/Git/Repository.pm