X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass.pm;h=e6cc6a7e8b59c6eea30f05f346f1f977b9e7d6c5;hb=f165eda8a5bb8140f9b40d78089d5db3d8edf572;hp=2510556f94adfaa646e8502f94bef0e294f61fbe;hpb=f92a9d790b900dcb183ff62b4e2e770a53f01ac6;p=dbsrgits%2FDBIx-Class.git

diff --git a/lib/DBIx/Class.pm b/lib/DBIx/Class.pm
index 2510556..e6cc6a7 100644
--- a/lib/DBIx/Class.pm
+++ b/lib/DBIx/Class.pm
@@ -3,7 +3,17 @@ package DBIx::Class;
 use strict;
 use warnings;
 
-use MRO::Compat;
+BEGIN {
+  if ($] < 5.009_005) {
+    require MRO::Compat;
+    *DBIx::Class::_ENV_::OLD_MRO = sub () { 1 };
+  }
+  else {
+    require mro;
+    *DBIx::Class::_ENV_::OLD_MRO = sub () { 0 };
+  }
+}
+
 use mro 'c3';
 
 use DBIx::Class::Optional::Dependencies;
@@ -308,6 +318,8 @@ ilmari: Dagfinn Ilmari MannsE<aring>ker <ilmari@ilmari.org>
 
 initself: Mike Baas <mike@initselftech.com>
 
+jawnsy: Jonathan Yu <jawnsy@cpan.org>
+
 jasonmay: Jason May <jason.a.may@gmail.com>
 
 jesper: Jesper Krogh
@@ -336,8 +348,12 @@ marcus: Marcus Ramberg <mramberg@cpan.org>
 
 mattlaw: Matt Lawrence
 
+mattp: Matt Phillips <mattp@cpan.org>
+
 michaelr: Michael Reddick <michael.reddick@gmail.com>
 
+milki: Jonathan Chu <milki@rescomp.berkeley.edu>
+
 ned: Neil de Carteret
 
 nigel: Nigel Metheringham <nigelm@cpan.org>
@@ -408,7 +424,7 @@ sszabo: Stephan Szabo <sszabo@bigpanda.com>
 
 talexb: Alex Beamish <talexb@gmail.com>
 
-tamias: Ronald J Kimball <rkimball@pangeamedia.com>
+tamias: Ronald J Kimball <rjk@tamias.net>
 
 teejay : Aaron Trevena <teejay@cpan.org>