From: David Kamholz <dkamholz@cpan.org>
Date: Thu, 6 Jul 2006 21:40:24 +0000 (+0000)
Subject: Merge 'trunk' into 'DBIx-Class-current'
X-Git-Tag: v0.07002~75^2~49
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=3ffa4e3b9cbe6bfc1d0ff1c8f20891aacdf13c09;p=dbsrgits%2FDBIx-Class.git

Merge 'trunk' into 'DBIx-Class-current'

r13443@haferschleim (orig r2096):  antirice | 2006-07-04 05:57:26 +0200
SQL::Abstract compatability
r13444@haferschleim (orig r2097):  matthewt | 2006-07-04 06:00:22 +0200
reverted commit that should have gone on branches/subselect
r13533@haferschleim (orig r2117):  jguenther | 2006-07-06 01:35:53 +0200
updated my contact info
---

3ffa4e3b9cbe6bfc1d0ff1c8f20891aacdf13c09
diff --cc lib/DBIx/Class.pm
index d75c352,2f05309..69c9385
--- a/lib/DBIx/Class.pm
+++ b/lib/DBIx/Class.pm
@@@ -206,10 -204,8 +206,10 @@@ castaway: Jess Robinso
  
  quicksilver: Jules Bean
  
- jguenther: Justin Guenther <guentherj@agr.gc.ca>
+ jguenther: Justin Guenther <jguenther@cpan.org>
  
 +captainL: Luke Saunders <luke.saunders@gmail.com>
 +
  draven: Marcus Ramberg <mramberg@cpan.org>
  
  nigel: Nigel Metheringham <nigelm@cpan.org>