From: Shawn M Moore <sartak@bestpractical.com>
Date: Sat, 24 Jul 2010 03:38:46 +0000 (-0400)
Subject: Merge remote branch 'origin/rfc/illegal_options_for_inheritance'
X-Git-Tag: 1.09~47
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=13e0ee4c017cc00917e026d760a629b0adac6a00;p=gitmo%2FMoose.git

Merge remote branch 'origin/rfc/illegal_options_for_inheritance'

Conflicts:
	Changes
---

13e0ee4c017cc00917e026d760a629b0adac6a00
diff --cc Changes
index 80b1989,2686ba2..d9426c6
--- a/Changes
+++ b/Changes
@@@ -7,6 -7,6 +7,9 @@@ for, noteworthy changes
      constraint has a coercion defined. If it doesn't, an error will be thrown
      when the attribute is defined. (Dave Rolsky)
  
++  * has '+foo' now has a blacklist rather than a whitelist for options which
++    can be legally inherited (doy, Tuomas Jormola).
++
    [NEW FEATURES]
  
    * We no longer unimport strict and warnings when Moose, Moose::Role, or