<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>lib/simple_config/controller_mixin.rb</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -2,4 +2,4 @@ $LOAD_PATH &lt;&lt; File.join(File.dirname(__FILE__), *%w[.. lib])
 
 require 'rails_compatibility' 
 require 'simple_config'
-require 'controller_mixin'
+require 'simple_config/controller_mixin'</diff>
      <filename>rails/init.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,7 +1,7 @@
 require File.join(File.dirname(__FILE__), *%w[test_helper])
 
 require 'simple_config'
-require 'controller_mixin'
+require 'simple_config/controller_mixin'
 
 class RailsController
   class &lt;&lt; self</diff>
      <filename>test/controller_mixin_test.rb</filename>
    </modified>
  </modified>
  <removed type="array">
    <removed>
      <filename>lib/controller_mixin.rb</filename>
    </removed>
  </removed>
  <parents type="array">
    <parent>
      <id>b94a3a0483d60e83764a562b2c1dff467873595d</id>
    </parent>
  </parents>
  <author>
    <name>James Adam</name>
    <email>james@lazyatom.com</email>
  </author>
  <url>http://github.com/lukeredpath/simpleconfig/commit/abedce9d68dae7310080aeed06c43d6ec1d216d4</url>
  <id>abedce9d68dae7310080aeed06c43d6ec1d216d4</id>
  <committed-date>2008-12-12T04:31:45-08:00</committed-date>
  <authored-date>2008-12-12T04:31:45-08:00</authored-date>
  <message>SimpleConfig's ControllerMixin will play nicer with Rails' conventions - if it defines a submodule of SimpleConfig, it should be in the simple_config directory.</message>
  <tree>454fcb967d55799934ba2d412848b62b5b26e9e4</tree>
  <committer>
    <name>James Adam</name>
    <email>james@lazyatom.com</email>
  </committer>
</commit>
