<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>install.sh</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -3,3 +3,4 @@
 .svn
 /pkg
 .idea
+*.gem</diff>
      <filename>.gitignore</filename>
    </modified>
    <modified>
      <diff>@@ -1,3 +1,7 @@
+== 2009-08-24
+
+* Merged forks that added lots of features, tests, and fixes
+
 == 2008-06-25
 
-* Removed stray puts
\ No newline at end of file
+* Removed stray puts</diff>
      <filename>CHANGELOG</filename>
    </modified>
    <modified>
      <diff>@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 2
-:patch: 0
+:patch: 1</diff>
      <filename>VERSION.yml</filename>
    </modified>
    <modified>
      <diff>@@ -1,5 +1,10 @@
-require 'subdomain-fu'
+require 'action_controller'
+
+# Add this path to ruby load path
+$:.unshift &quot;#{File.dirname(__FILE__)}/../lib&quot;
+
+require 'subdomain-fu' unless defined?(SubdomainFu)
 
 ActionController::Base.send :include, SubdomainFu::Controller
 
-RAILS_DEFAULT_LOGGER.info(&quot;** SubdomainFu: initialized properly&quot;)
\ No newline at end of file
+RAILS_DEFAULT_LOGGER.info(&quot;** SubdomainFu: initialized properly&quot;)</diff>
      <filename>rails/init.rb</filename>
    </modified>
    <modified>
      <diff>@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{subdomain-fu}
-  s.version = &quot;0.2.0&quot;
+  s.version = &quot;0.2.1&quot;
 
   s.required_rubygems_version = Gem::Requirement.new(&quot;&gt;= 0&quot;) if s.respond_to? :required_rubygems_version=
   s.authors = [&quot;Michael Bleigh&quot;,&quot;Peter Boling&quot;]</diff>
      <filename>subdomain-fu.gemspec</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>9912cc63fee56b03a8fef88ebc64d1981fdf35bf</id>
    </parent>
  </parents>
  <author>
    <name>pboling</name>
    <email>peter.boling@peterboling.com</email>
  </author>
  <url>http://github.com/mbleigh/subdomain-fu/commit/cf4f3edb24f9f380df971caada9dde6d50c2687d</url>
  <id>cf4f3edb24f9f380df971caada9dde6d50c2687d</id>
  <committed-date>2009-08-25T13:36:58-07:00</committed-date>
  <authored-date>2009-08-25T13:36:58-07:00</authored-date>
  <message>installs correctly, only 9 failing tests to fix.</message>
  <tree>a466a2531b6bda03c70c43879de3979acd88b5fc</tree>
  <committer>
    <name>pboling</name>
    <email>peter.boling@peterboling.com</email>
  </committer>
</commit>
