<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array"/>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>9070b162bd36a3a63d1f42550a415e5744dcd108</id>
    </parent>
    <parent>
      <id>e38b2381baf24ed58df64719da324a9c1559b6a7</id>
    </parent>
  </parents>
  <author>
    <name>Tim Harper</name>
    <email>timcharper@gmail.com</email>
  </author>
  <url>http://github.com/robd/active_scaffold/commit/7f4ad4a038b7a415ebd07acd833a5970418032c7</url>
  <id>7f4ad4a038b7a415ebd07acd833a5970418032c7</id>
  <committed-date>2008-06-20T10:30:00-07:00</committed-date>
  <authored-date>2008-06-20T10:30:00-07:00</authored-date>
  <message>Merge branch 'master' into rails-2.1</message>
  <tree>37ef790fbb63a5ac54228ef8bc0b34048c5d9de0</tree>
  <committer>
    <name>Tim Harper</name>
    <email>timcharper@gmail.com</email>
  </committer>
</commit>
