From: Dave Rolsky <autarch@urth.org>
Date: Wed, 29 Jul 2009 21:48:57 +0000 (-0500)
Subject: Merge branch 'stable'
X-Git-Tag: 0.92~13
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=5e57b7e6c595e4d4d893bda929beea1ee92f4c45;p=gitmo%2FClass-MOP.git

Merge branch 'stable'

Conflicts:
	Changes
---

5e57b7e6c595e4d4d893bda929beea1ee92f4c45
diff --cc Changes
index 7df849f,d5fda08..02ef230
--- a/Changes
+++ b/Changes
@@@ -1,20 -1,9 +1,20 @@@
  Revision history for Perl extension Class-MOP.
  
- 0.91
++0.92
 +    * Class::MOP::Class
 +    * Class::MOP::Package
 +      - Move get_method_map and its various scaffolding into
 +        Package. (hdp)
 +
 +    * Class::MOP::Method
 +      - Allow Class::MOP::Method->wrap to take a Class::MOP::Method
 +        object as the first argument, rather than just a
 +        coderef. (doy)
 +
+ 0.91 Wed Jul 29, 2009
      * Class::MOP::Method::Wrapped
-       - Fixing variable usage issues with the patch from previous
-         version, not properly using lexicals in the for
-         loops. (stevan)
+       - Fixing variable usage issues with the patch from previous version,
+         not properly using lexicals in the for loops. (stevan)
  
  0.90 Tue Jul 21, 2009
      Japan Perl Association has sponsored Goro Fuji to improve startup
diff --cc lib/Class/MOP/Class.pm
index a1de0c8,df62de7..400ddd3
--- a/lib/Class/MOP/Class.pm
+++ b/lib/Class/MOP/Class.pm
@@@ -11,10 -11,10 +11,10 @@@ use Class::MOP::Method::Constructor
  
  use Carp         'confess';
  use Scalar::Util 'blessed', 'reftype', 'weaken';
 -use Sub::Name 'subname';
 +use Sub::Name    'subname';
  use Devel::GlobalDestruction 'in_global_destruction';
  
- our $VERSION   = '0.90';
+ our $VERSION   = '0.91';
  $VERSION = eval $VERSION;
  our $AUTHORITY = 'cpan:STEVAN';
  
diff --cc lib/Class/MOP/Method.pm
index e6dc0a0,b242c27..857fc03
--- a/lib/Class/MOP/Method.pm
+++ b/lib/Class/MOP/Method.pm
@@@ -5,9 -5,9 +5,9 @@@ use strict
  use warnings;
  
  use Carp         'confess';
 -use Scalar::Util 'weaken', 'reftype';
 +use Scalar::Util 'weaken', 'reftype', 'blessed';
  
- our $VERSION   = '0.90';
+ our $VERSION   = '0.91';
  $VERSION = eval $VERSION;
  our $AUTHORITY = 'cpan:STEVAN';
  
diff --cc lib/Class/MOP/Package.pm
index 9a5fc73,78333a1..5da609f
--- a/lib/Class/MOP/Package.pm
+++ b/lib/Class/MOP/Package.pm
@@@ -6,9 -6,8 +6,9 @@@ use warnings
  
  use Scalar::Util 'blessed', 'reftype';
  use Carp         'confess';
 +use Sub::Name    'subname';
  
- our $VERSION   = '0.90';
+ our $VERSION   = '0.91';
  $VERSION = eval $VERSION;
  our $AUTHORITY = 'cpan:STEVAN';