Merge branch 'master' of git.shadowcat.co.uk:DBIx-Class-Schema-Loader

diff --git a/.gitignore b/.gitignore
index 9f8f6df..8bb2756 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
 /Makefile
 /MANIFEST
 /META.yml
+/README

diff --git a/Makefile.PL b/Makefile.PL
index df136e1..f4b33e9 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -136,7 +136,7 @@ realclean_files 'README';
 
 resources 'IRC'         => 'irc://irc.perl.org/#dbix-class';
 resources 'license'     => 'http://dev.perl.org/licenses/';
-resources 'repository'  => 'http://dev.catalyst.perl.org/repos/bast/branches/DBIx-Class-Schema-Loader/current/';
+resources 'repository'  => 'git://git.shadowcat.co.uk/dbsrgits/DBIx-Class-Schema-Loader.git';
 resources 'MailingList' => 'http://lists.scsys.co.uk/cgi-bin/mailman/listinfo/dbix-class';
 
 auto_provides;

diff --git a/TODO b/TODO
index 3506b5b..a2ba73f 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,8 +1,3 @@
-0.05 BLOCKERS
-=============
-
-Add backwards-compatibility mode when regenerating a 0.04-generated schema
-
 OTHER STUFF
 ===========
 

diff --git a/lib/DBIx/Class/Schema/Loader.pm b/lib/DBIx/Class/Schema/Loader.pm
index a763cb0..8904b27 100644 (file)
--- a/lib/DBIx/Class/Schema/Loader.pm
+++ b/lib/DBIx/Class/Schema/Loader.pm
@@ -463,7 +463,7 @@ blblack: Brandon Black <blblack@gmail.com>
 
 =head1 CONTRIBUTORS
 
-ilmarii: Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>
+ilmari: Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>
 
 arcanez: Justin Hunter <justin.d.hunter@gmail.com>