<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array"/>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>7508227c39d67c1d5a2fa4db29064e16e3aa624a</id>
    </parent>
    <parent>
      <id>fdb71c710d3530a6e9c824336c7c0011549d8782</id>
    </parent>
  </parents>
  <author>
    <name>Joshua Clayton</name>
    <email>jclayton@fusionary.com</email>
  </author>
  <url>http://github.com/joshuaclayton/acts_as_searchable/commit/fbaf267c51cdf6b76b5a1afb3e33e681947e2bc9</url>
  <id>fbaf267c51cdf6b76b5a1afb3e33e681947e2bc9</id>
  <committed-date>2008-07-02T06:51:34-07:00</committed-date>
  <authored-date>2008-07-02T06:51:34-07:00</authored-date>
  <message>Merge branch 'master' of git@github.com:joshuaclayton/acts_as_searchable

Conflicts:

	README
	lib/acts_as_searchable.rb</message>
  <tree>9fe368ca75bc7ff121ed5f48dc85e4573e683ca2</tree>
  <committer>
    <name>Joshua Clayton</name>
    <email>jclayton@fusionary.com</email>
  </committer>
</commit>
