<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>app/views/admin/articles/_article.html.erb</filename>
    </added>
    <added>
      <filename>app/views/admin/articles/_form.html.erb</filename>
    </added>
    <added>
      <filename>app/views/admin/articles/edit.html.erb</filename>
    </added>
    <added>
      <filename>app/views/admin/articles/index.html.erb</filename>
    </added>
    <added>
      <filename>app/views/admin/articles/new.html.erb</filename>
    </added>
    <added>
      <filename>app/views/admin/articles/show.html.erb</filename>
    </added>
    <added>
      <filename>app/views/admin/configurations/show.html.erb</filename>
    </added>
    <added>
      <filename>app/views/admin/dashboard/index.html.erb</filename>
    </added>
    <added>
      <filename>app/views/articles/_article.html.erb</filename>
    </added>
    <added>
      <filename>app/views/articles/index.html.erb</filename>
    </added>
    <added>
      <filename>app/views/articles/show.html.erb</filename>
    </added>
    <added>
      <filename>app/views/layout/admin.html.erb</filename>
    </added>
    <added>
      <filename>app/views/layout/admin.js.erb</filename>
    </added>
    <added>
      <filename>app/views/layout/application.html.erb</filename>
    </added>
    <added>
      <filename>app/views/layout/exceptions.html.erb</filename>
    </added>
    <added>
      <filename>app/views/shared/_archive.html.erb</filename>
    </added>
    <added>
      <filename>app/views/shared/_formatting_help.html.erb</filename>
    </added>
    <added>
      <filename>slices/merb-auth/app/views/sessions/new.html.erb</filename>
    </added>
    <added>
      <filename>slices/merb-auth/app/views/users/_user.html.erb</filename>
    </added>
    <added>
      <filename>slices/merb-auth/app/views/users/edit.html.erb</filename>
    </added>
    <added>
      <filename>slices/merb-auth/app/views/users/index.html.erb</filename>
    </added>
    <added>
      <filename>slices/merb-auth/app/views/users/new.html.erb</filename>
    </added>
    <added>
      <filename>slices/merb-auth/app/views/users/show.html.erb</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -60,8 +60,6 @@ dependency &quot;merb-auth&quot;
 dependency &quot;dm-aggregates&quot;
 dependency &quot;dm-validations&quot;
 dependency &quot;dm-timestamps&quot;
-dependency &quot;merb-haml&quot;
-dependency &quot;haml&quot;
 
 # OR
 # OR</diff>
      <filename>config/init.rb</filename>
    </modified>
  </modified>
  <removed type="array">
    <removed>
      <filename>app/views/admin/articles/_article.html.haml</filename>
    </removed>
    <removed>
      <filename>app/views/admin/articles/_form.html.haml</filename>
    </removed>
    <removed>
      <filename>app/views/admin/articles/edit.html.haml</filename>
    </removed>
    <removed>
      <filename>app/views/admin/articles/index.html.haml</filename>
    </removed>
    <removed>
      <filename>app/views/admin/articles/new.html.haml</filename>
    </removed>
    <removed>
      <filename>app/views/admin/articles/show.html.haml</filename>
    </removed>
    <removed>
      <filename>app/views/admin/configurations/show.html.haml</filename>
    </removed>
    <removed>
      <filename>app/views/admin/dashboard/index.html.haml</filename>
    </removed>
    <removed>
      <filename>app/views/articles/_article.html.haml</filename>
    </removed>
    <removed>
      <filename>app/views/articles/index.html.haml</filename>
    </removed>
    <removed>
      <filename>app/views/articles/show.html.haml</filename>
    </removed>
    <removed>
      <filename>app/views/layout/admin.html.haml</filename>
    </removed>
    <removed>
      <filename>app/views/layout/admin.js.haml</filename>
    </removed>
    <removed>
      <filename>app/views/layout/application.html.haml</filename>
    </removed>
    <removed>
      <filename>app/views/layout/exceptions.html.haml</filename>
    </removed>
    <removed>
      <filename>app/views/shared/_archive.html.haml</filename>
    </removed>
    <removed>
      <filename>app/views/shared/_formatting_help.html.haml</filename>
    </removed>
    <removed>
      <filename>slices/merb-auth/app/views/sessions/new.html.haml</filename>
    </removed>
    <removed>
      <filename>slices/merb-auth/app/views/users/_user.html.haml</filename>
    </removed>
    <removed>
      <filename>slices/merb-auth/app/views/users/edit.html.haml</filename>
    </removed>
    <removed>
      <filename>slices/merb-auth/app/views/users/index.html.haml</filename>
    </removed>
    <removed>
      <filename>slices/merb-auth/app/views/users/new.html.haml</filename>
    </removed>
    <removed>
      <filename>slices/merb-auth/app/views/users/show.html.haml</filename>
    </removed>
  </removed>
  <parents type="array">
    <parent>
      <id>2116ad59187848d33d5dfaef4d6ddc41f74e30bb</id>
    </parent>
  </parents>
  <author>
    <name>AJ Christensen</name>
    <email>aj@junglist.gen.nz</email>
  </author>
  <url>http://github.com/mleung/feather/commit/afd1eba46cd799af432dae89f9c4a75822c1e031</url>
  <id>afd1eba46cd799af432dae89f9c4a75822c1e031</id>
  <committed-date>2008-07-27T15:33:18-07:00</committed-date>
  <authored-date>2008-07-27T15:33:18-07:00</authored-date>
  <message>Revert &quot;Haml + MA Slice Form.&quot;

This reverts commit d06b02b52a66b8a0219a9c9fcf3bb71d1ec18fa9.</message>
  <tree>9720fd1af8c43962f97ba2d1dc4de41fe4c58f80</tree>
  <committer>
    <name>AJ Christensen</name>
    <email>aj@junglist.gen.nz</email>
  </committer>
</commit>
