From: Hans Dieter Pearcey <hdp@weftsoar.net>
Date: Sat, 15 Aug 2009 20:36:04 +0000 (-0700)
Subject: Merge branch 'master' into attribute_helpers
X-Git-Tag: 0.89_02~68
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=ed5d4812547cdbda8cb46bde33e34064a84b52ee;p=gitmo%2FMoose.git

Merge branch 'master' into attribute_helpers

Conflicts:
	Changes
---

ed5d4812547cdbda8cb46bde33e34064a84b52ee
diff --cc Changes
index ab6a8d5,7412ed0..5af4bb4
--- a/Changes
+++ b/Changes
@@@ -1,15 -1,7 +1,17 @@@
  Also see Moose::Manual::Delta for more details of, and workarounds
  for, noteworthy changes.
  
 +next version
 +    * Moose::Meta::Attribute
 +      - Added the currying syntax for delegation from AttributeHelpers
 +        to the existing delegation API. (hdp)
 +
-     * Moose::AttributeHelpers
-       - Moved in from MooseX with API tweaks. See Moose::Manual::Delta for
-         details. (hdp, jhannah, rbuels)
++    * Moose::Meta::Attribute::Native
++      - Moved in from MooseX::AttributeHelpers with API tweaks. See
++        Moose::Manual::Delta for details. (hdp, jhannah, rbuels, Sartak,
++        perigrin, doy)
 +
+ 0.89 Thu Aug 13, 2009
      * Moose::Manual::Attributes
        - Clarify "is", include discussion of "bare". (Sartak)