projects / dbsrgits/DBIx-Class.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7244b45 e4c66bc)
Merge 'trunk' into 'cdbicompat_integration'
Michael G Schwern [Wed, 16 Jan 2008 10:27:08 +0000 (10:27 +0000)]
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.


Trivial merge
The Perl ORM (dbsrgits@git.shadowcat.co.uk:DBIx-Class.git)