fixed conflicts after merging 0.06
authorJohn Napiorkowski <jjnapiork@cpan.org>
Fri, 24 Oct 2008 20:52:30 +0000 (20:52 +0000)
committerJohn Napiorkowski <jjnapiork@cpan.org>
Fri, 24 Oct 2008 20:52:30 +0000 (20:52 +0000)
commitbb9f33718fd113a1802b2e64570bb4b6d258295f
treec6fb056ee744948124e4a4202dba5f6339c648ba
parentf235df49d0d645313d5afeecf7ace023bb6f78ad
fixed conflicts after merging
t/lib/DecoratorLibrary.pm