From: Justin Guenther <jguenther@cpan.org>
Date: Thu, 16 Mar 2006 16:26:06 +0000 (+0100)
Subject: Merge 'trunk' into 'DBIx-Class-current'
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=7ae7029a88ae7083d74a690dcad468a0c97ebccc;p=dbsrgits%2FDBIx-Class-Historic.git

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

r9906@haferschleim (orig r1105):  jguenther | 2006-03-16 10:26:06 +0100
fixed e-mail address
---

7ae7029a88ae7083d74a690dcad468a0c97ebccc
diff --cc lib/DBIx/Class.pm
index 444dc59,2228a86..144a495
--- a/lib/DBIx/Class.pm
+++ b/lib/DBIx/Class.pm
@@@ -172,14 -164,8 +172,12 @@@ Scotty Allen <scotty@scottyallen.com
  
  sc_
  
- Robert Sedlacek <phaylon@dunkelheit.at>
- 
- Justin Guenther <jguenther@agr.gc.ca>
+ Justin Guenther <guentherj@agr.gc.ca>
  
 +Daisuke Murase <typester@cpan.org>
 +
 +Scott McWhirter (konobi)
 +
  =head1 LICENSE
  
  You may distribute this code under the same terms as Perl itself.