Merge branch 'blead'

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

diff --git a/TODO b/TODO
index 9997221..aa73df2 100644 (file)
--- a/TODO
+++ b/TODO
@@ -3,7 +3,6 @@ TODO:
 Mouse
 
 * smart exporters
-* trait mechanism
 * native traits
 
 MouseX

diff --git a/lib/Mouse.pm b/lib/Mouse.pm
index 1e7e5d0..a18bef8 100644 (file)
--- a/lib/Mouse.pm
+++ b/lib/Mouse.pm
@@ -4,7 +4,7 @@ use warnings;
 use 5.006;
 use base 'Exporter';
 
-our $VERSION = '0.32';
+our $VERSION = '0.33';
 
 use Carp 'confess';
 use Scalar::Util 'blessed';