<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array"/>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>1ae2d4936b26584849ce06189632cdbf997c4009</id>
    </parent>
    <parent>
      <id>c28af904730a538b7b868114d5c7d8fc14ee54dd</id>
    </parent>
  </parents>
  <author>
    <name>Sam Smoot</name>
    <email>ssmoot@gmail.com</email>
  </author>
  <url>http://github.com/sam/do/commit/6c7a8adfbfedc8ebcb59e23e4248c233bd3beae1</url>
  <id>6c7a8adfbfedc8ebcb59e23e4248c233bd3beae1</id>
  <committed-date>2008-05-01T05:20:55-07:00</committed-date>
  <authored-date>2008-05-01T05:20:55-07:00</authored-date>
  <message>Merge branch 'master' of git@github.com:sam/do

Conflicts:

	do_mysql/ext/do_mysql_ext.c
	do_postgres/ext/do_postgres_ext.c
	do_sqlite3/ext/do_sqlite3_ext.c</message>
  <tree>c94020bb4a95bcb69595818fe327a1130adb6ca2</tree>
  <committer>
    <name>Sam Smoot</name>
    <email>ssmoot@gmail.com</email>
  </committer>
</commit>
