<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -1,5 +1,5 @@
 # make sure we're running inside Merb
-if defined?(Merb::Plugins)  
+if defined?(Merb)  
   require &quot;haml&quot;
   require &quot;merb-haml/template&quot;
   Merb::Plugins.add_rakefiles(File.join(File.dirname(__FILE__) / &quot;merb-haml&quot; / &quot;merbtasks&quot;))</diff>
      <filename>merb-haml/lib/merb-haml.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>8a0fc6fd3448b1e271936a09035cb9cc28ae1cea</id>
    </parent>
  </parents>
  <author>
    <name>Yehuda Katz</name>
    <email>wycats@gmail.com</email>
  </author>
  <url>http://github.com/wycats/merb/commit/fc92683ae1189ea4f97db90d7b15852224293cf8</url>
  <id>fc92683ae1189ea4f97db90d7b15852224293cf8</id>
  <committed-date>2008-10-29T23:50:08-07:00</committed-date>
  <authored-date>2008-10-29T23:50:08-07:00</authored-date>
  <message>Look for Merb, not Merb::Plugins</message>
  <tree>b76da7a512076fffc7b7ca4f91ef02a244985ba0</tree>
  <committer>
    <name>Yehuda Katz</name>
    <email>wycats@gmail.com</email>
  </committer>
</commit>
