Merge branch 'swann-with-json' into swann
authorDan Brook <broq@cpan.org>
Thu, 6 May 2010 22:23:13 +0000 (23:23 +0100)
committerDan Brook <broq@cpan.org>
Thu, 6 May 2010 22:23:13 +0000 (23:23 +0100)
commit46b049a2a5a83f582105e641850ddc70871030fa
tree36acac02f103121e520125a4dca91333da81b2be
parent15b335eead91aadd67bcce35c124e88f1a9f2894
parentc6e886757a1bfe4deffc9c5021dd11dd027d158e
Merge branch 'swann-with-json' into swann
Makefile.PL