<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -1,5 +1,7 @@
 == master
 
+* Change how the base module is included to prevent namespacing conflicts
+
 == 0.3.0 / 2008-09-07
 
 * No longer allow additional arguments to be passed into event actions</diff>
      <filename>CHANGELOG.rdoc</filename>
    </modified>
    <modified>
      <diff>@@ -5,12 +5,6 @@ module PluginAWeek #:nodoc:
   # transitions.  This helper adds support for defining this type of
   # functionality within ActiveRecord models.
   module StateMachine
-    def self.included(base) #:nodoc:
-      base.class_eval do
-        extend PluginAWeek::StateMachine::MacroMethods
-      end
-    end
-    
     module MacroMethods
       # Creates a state machine for the given attribute.  The default attribute
       # is &quot;state&quot;.
@@ -125,5 +119,5 @@ module PluginAWeek #:nodoc:
 end
 
 ActiveRecord::Base.class_eval do
-  include PluginAWeek::StateMachine
+  extend PluginAWeek::StateMachine::MacroMethods
 end</diff>
      <filename>lib/state_machine.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>2baae6566351461b8140895cd8ae8db450cb182b</id>
    </parent>
  </parents>
  <author>
    <name>Aaron Pfeifer</name>
    <login>obrie</login>
    <email>aaron.pfeifer@gmail.com</email>
  </author>
  <url>http://github.com/pluginaweek/state_machine/commit/a3cbd3308f37deb083d277c1b253837e93e3407a</url>
  <id>a3cbd3308f37deb083d277c1b253837e93e3407a</id>
  <committed-date>2008-10-04T14:51:45-07:00</committed-date>
  <authored-date>2008-10-04T14:51:45-07:00</authored-date>
  <message>Change how the base module is included to prevent namespacing conflicts</message>
  <tree>53f43160f2d4bfb58ac7643ef48de01fc3c5f795</tree>
  <committer>
    <name>Aaron Pfeifer</name>
    <login>obrie</login>
    <email>aaron.pfeifer@gmail.com</email>
  </committer>
</commit>
