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

diff --git a/lib/DBIx/Class.pm b/lib/DBIx/Class.pm
index d75c352..69c9385 100644 (file)
--- a/lib/DBIx/Class.pm
+++ b/lib/DBIx/Class.pm
@@ -206,7 +206,7 @@ castaway: Jess Robinson
 
 quicksilver: Jules Bean
 
-jguenther: Justin Guenther <guentherj@agr.gc.ca>
+jguenther: Justin Guenther <jguenther@cpan.org>
 
 captainL: Luke Saunders <luke.saunders@gmail.com>