From: gfx <gfuji@cpan.org>
Date: Thu, 24 Sep 2009 07:30:10 +0000 (+0900)
Subject: Merge branch 'blead'
X-Git-Tag: 0.35~33
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=ef9070cc6ee59ca3691f3765ad96ef0922e064ca;p=gitmo%2FMouse.git

Merge branch 'blead'

Conflicts:
	Changes
	TODO
	lib/Mouse/Meta/Method.pm
---

ef9070cc6ee59ca3691f3765ad96ef0922e064ca
diff --cc TODO
index 265910a,9997221..aa73df2
--- a/TODO
+++ b/TODO
@@@ -3,8 -3,7 +3,6 @@@ TODO
  Mouse
  
  * smart exporters
- * method confliction
--* trait mechanism
  * native traits
  
  MouseX
diff --cc lib/Mouse.pm
index 6e208e7,1e7e5d0..a18bef8
--- a/lib/Mouse.pm
+++ b/lib/Mouse.pm
@@@ -4,10 -4,8 +4,8 @@@ use warnings
  use 5.006;
  use base 'Exporter';
  
 -our $VERSION = '0.32';
 +our $VERSION = '0.33';
  
- sub moose_version(){ 0.90 } # which Mouse is a subset of
- 
  use Carp 'confess';
  use Scalar::Util 'blessed';