From: Michael G Schwern Date: Wed, 16 Jan 2008 10:27:08 +0000 (+0000) Subject: Merge 'trunk' into 'cdbicompat_integration' X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=fcf2ffde70eb51d7df02e068ac1031d8825b161f;p=dbsrgits%2FDBIx-Class-Historic.git Merge 'trunk' into 'cdbicompat_integration' r52292@windhund (orig r3942): schwern | 2008-01-16 02:25:36 -0800 Declare dep on JSON::Any rather than JSON. No reason JSON::Any should prefer JSON.pm over it's default ordering. r52293@windhund (orig r3943): schwern | 2008-01-16 02:26:26 -0800 And fix the check in the dbicadmin test to look for JSON::Any. --- fcf2ffde70eb51d7df02e068ac1031d8825b161f