<?xml version="1.0" encoding="UTF-8"?>
<commits type="array">
  <commit>
    <parents type="array">
      <parent>
        <id>525d1623513d8cb172a99c61fd1c26e759f26bd6</id>
      </parent>
    </parents>
    <author>
      <name>Travis Tilley</name>
      <email>ttilley@gmail.com</email>
    </author>
    <url>http://github.com/rubyist/aasm/commit/4c70b0fc546cb88e8443ebfe26be42f0d0ded7ca</url>
    <id>4c70b0fc546cb88e8443ebfe26be42f0d0ded7ca</id>
    <committed-date>2009-10-23T13:47:12-07:00</committed-date>
    <authored-date>2009-10-23T13:47:12-07:00</authored-date>
    <message>...oops. another documentation fix.</message>
    <tree>984b3e18358a85134b3a9a806792ebadd97c9d61</tree>
    <committer>
      <name>Travis Tilley</name>
      <email>ttilley@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>1f9832f64fb1eff52d34e41516ac2ea4224488df</id>
      </parent>
    </parents>
    <author>
      <name>Travis Tilley</name>
      <email>ttilley@gmail.com</email>
    </author>
    <url>http://github.com/rubyist/aasm/commit/525d1623513d8cb172a99c61fd1c26e759f26bd6</url>
    <id>525d1623513d8cb172a99c61fd1c26e759f26bd6</id>
    <committed-date>2009-10-23T13:45:05-07:00</committed-date>
    <authored-date>2009-10-23T13:45:05-07:00</authored-date>
    <message>change the home page to be the new sdoc page</message>
    <tree>1917b8e8cd2bde64ed557662aa77753f34aa8283</tree>
    <committer>
      <name>Travis Tilley</name>
      <email>ttilley@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>312f6234b1d9a2d46c9e3cdb9af57904aa25612f</id>
      </parent>
    </parents>
    <author>
      <name>Travis Tilley</name>
      <email>ttilley@gmail.com</email>
    </author>
    <url>http://github.com/rubyist/aasm/commit/1f9832f64fb1eff52d34e41516ac2ea4224488df</url>
    <id>1f9832f64fb1eff52d34e41516ac2ea4224488df</id>
    <committed-date>2009-10-23T13:33:47-07:00</committed-date>
    <authored-date>2009-10-23T13:33:47-07:00</authored-date>
    <message>Version bump to 2.1.3</message>
    <tree>a0837e18cec35868482b4c0750c397eedfdeb71a</tree>
    <committer>
      <name>Travis Tilley</name>
      <email>ttilley@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>f423fc6d9b1b6c737627a8079d53a23d4ccbb645</id>
      </parent>
    </parents>
    <author>
      <name>Travis Tilley</name>
      <email>ttilley@gmail.com</email>
    </author>
    <url>http://github.com/rubyist/aasm/commit/312f6234b1d9a2d46c9e3cdb9af57904aa25612f</url>
    <id>312f6234b1d9a2d46c9e3cdb9af57904aa25612f</id>
    <committed-date>2009-10-23T13:33:01-07:00</committed-date>
    <authored-date>2009-10-23T13:33:01-07:00</authored-date>
    <message>gemcutter is now the preferred installation method</message>
    <tree>d30b7f531e106b18a2d1c51e370995bc4fe920f6</tree>
    <committer>
      <name>Travis Tilley</name>
      <email>ttilley@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>72e43ad88ecda9913b5c76ce7b27701d6ceca94f</id>
      </parent>
    </parents>
    <author>
      <name>Travis Tilley</name>
      <email>ttilley@gmail.com</email>
    </author>
    <url>http://github.com/rubyist/aasm/commit/f423fc6d9b1b6c737627a8079d53a23d4ccbb645</url>
    <id>f423fc6d9b1b6c737627a8079d53a23d4ccbb645</id>
    <committed-date>2009-10-23T13:30:25-07:00</committed-date>
    <authored-date>2009-10-23T13:30:25-07:00</authored-date>
    <message>re-title</message>
    <tree>348c92286c8ab1d2f2273355398c483d04971d1a</tree>
    <committer>
      <name>Travis Tilley</name>
      <email>ttilley@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>7167f67980bb284b8db10fb0196332101619eca1</id>
      </parent>
      <parent>
        <id>e97a93089705ca55c8ac9c59afb8b75695f0c5cc</id>
      </parent>
    </parents>
    <author>
      <name>Travis Tilley</name>
      <email>ttilley@gmail.com</email>
    </author>
    <url>http://github.com/rubyist/aasm/commit/72e43ad88ecda9913b5c76ce7b27701d6ceca94f</url>
    <id>72e43ad88ecda9913b5c76ce7b27701d6ceca94f</id>
    <committed-date>2009-10-23T13:28:29-07:00</committed-date>
    <authored-date>2009-10-23T13:28:29-07:00</authored-date>
    <message>Merge remote branch 'ttilley/master'

Conflicts:
	Rakefile</message>
    <tree>ddd37d46349972a4ac4eb9d8d4bc34f0655e63e2</tree>
    <committer>
      <name>Travis Tilley</name>
      <email>ttilley@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>dfc2874972daf601f3eeb4cd2bff589290cc2521</id>
      </parent>
    </parents>
    <author>
      <name>Scott Barron</name>
      <email>scott@elitists.net</email>
    </author>
    <url>http://github.com/rubyist/aasm/commit/7167f67980bb284b8db10fb0196332101619eca1</url>
    <id>7167f67980bb284b8db10fb0196332101619eca1</id>
    <committed-date>2009-10-23T08:57:24-07:00</committed-date>
    <authored-date>2009-10-23T08:57:24-07:00</authored-date>
    <message>Update gemspec things</message>
    <tree>d0ce09baa183384a2e5308a1a40e77857fa43327</tree>
    <committer>
      <name>Scott Barron</name>
      <email>scott@elitists.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>dc002d4684a481fed59c88b4916f7b0c29354d96</id>
      </parent>
    </parents>
    <author>
      <name>Travis Tilley</name>
      <email>ttilley@gmail.com</email>
    </author>
    <url>http://github.com/rubyist/aasm/commit/e97a93089705ca55c8ac9c59afb8b75695f0c5cc</url>
    <id>e97a93089705ca55c8ac9c59afb8b75695f0c5cc</id>
    <committed-date>2009-10-20T11:39:29-07:00</committed-date>
    <authored-date>2009-10-20T11:39:29-07:00</authored-date>
    <message>check to see if the aasm_column is blank</message>
    <tree>b0525bb95d5b9603945019a9fa80faf85b6f3a77</tree>
    <committer>
      <name>Travis Tilley</name>
      <email>ttilley@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>80d7896eced7981acae301a8ed8f93cb36932804</id>
      </parent>
    </parents>
    <author>
      <name>Travis Tilley</name>
      <email>ttilley@gmail.com</email>
    </author>
    <url>http://github.com/rubyist/aasm/commit/dc002d4684a481fed59c88b4916f7b0c29354d96</url>
    <id>dc002d4684a481fed59c88b4916f7b0c29354d96</id>
    <committed-date>2009-10-19T11:38:59-07:00</committed-date>
    <authored-date>2009-10-14T21:34:08-07:00</authored-date>
    <message>cleanup, some refactoring, additional tests (one modeled after a common use of AASM, from restful authentication), fire callbacks on entering initial state, whitespace</message>
    <tree>6d295e85a701d2379577eb96d4231d390e1d26e9</tree>
    <committer>
      <name>Travis Tilley</name>
      <email>ttilley@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>4eea7624b8eec920a631de4d1d6a9e2a9e909b9d</id>
      </parent>
      <parent>
        <id>404a9d31036be314490daecd857395d9ba40c415</id>
      </parent>
    </parents>
    <author>
      <name>Travis Tilley</name>
      <email>ttilley@gmail.com</email>
    </author>
    <url>http://github.com/rubyist/aasm/commit/80d7896eced7981acae301a8ed8f93cb36932804</url>
    <id>80d7896eced7981acae301a8ed8f93cb36932804</id>
    <committed-date>2009-10-14T20:26:24-07:00</committed-date>
    <authored-date>2009-10-14T20:26:24-07:00</authored-date>
    <message>Merge remote branch 'gpetrica/master'</message>
    <tree>84ab99eb802029b4a3d3fdbf578fa4aa54071111</tree>
    <committer>
      <name>Travis Tilley</name>
      <email>ttilley@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>da3c44d36762dfbb0f00812e6e25146d1dddeaaa</id>
      </parent>
    </parents>
    <author>
      <name>Travis Tilley</name>
      <email>ttilley@gmail.com</email>
    </author>
    <url>http://github.com/rubyist/aasm/commit/4eea7624b8eec920a631de4d1d6a9e2a9e909b9d</url>
    <id>4eea7624b8eec920a631de4d1d6a9e2a9e909b9d</id>
    <committed-date>2009-10-14T20:19:35-07:00</committed-date>
    <authored-date>2009-10-14T20:19:35-07:00</authored-date>
    <message>use sdoc for generating truly awesome searchable documentation</message>
    <tree>2ee27e486f29042a987aff272ea52c47954084fc</tree>
    <committer>
      <name>Travis Tilley</name>
      <email>ttilley@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>dc068014afe262345f99bf483ba2230ccf3ea174</id>
      </parent>
    </parents>
    <author>
      <name>Travis Tilley</name>
      <email>ttilley@gmail.com</email>
    </author>
    <url>http://github.com/rubyist/aasm/commit/da3c44d36762dfbb0f00812e6e25146d1dddeaaa</url>
    <id>da3c44d36762dfbb0f00812e6e25146d1dddeaaa</id>
    <committed-date>2009-10-14T20:09:54-07:00</committed-date>
    <authored-date>2009-10-14T20:09:54-07:00</authored-date>
    <message>ignore gemspec files</message>
    <tree>434ddd6b3615e096e5d942fad59df7b5e8402a0b</tree>
    <committer>
      <name>Travis Tilley</name>
      <email>ttilley@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>6618c50b75eba48ba0b2c896c705a74fb4e1588d</id>
      </parent>
    </parents>
    <author>
      <name>Travis Tilley</name>
      <email>ttilley@gmail.com</email>
    </author>
    <url>http://github.com/rubyist/aasm/commit/dc068014afe262345f99bf483ba2230ccf3ea174</url>
    <id>dc068014afe262345f99bf483ba2230ccf3ea174</id>
    <committed-date>2009-10-14T20:07:46-07:00</committed-date>
    <authored-date>2009-10-14T20:03:38-07:00</authored-date>
    <message>cleanup, move to jeweler, nuke gemspec</message>
    <tree>46614b72216d6dc14af5605cb68d787a49d21177</tree>
    <committer>
      <name>Travis Tilley</name>
      <email>ttilley@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>fe13954e9337ecc3a4196509c5e27a7c17bad33c</id>
      </parent>
    </parents>
    <author>
      <name>Travis Tilley</name>
      <email>ttilley@gmail.com</email>
    </author>
    <url>http://github.com/rubyist/aasm/commit/6618c50b75eba48ba0b2c896c705a74fb4e1588d</url>
    <id>6618c50b75eba48ba0b2c896c705a74fb4e1588d</id>
    <committed-date>2009-10-14T19:42:56-07:00</committed-date>
    <authored-date>2009-10-14T19:35:38-07:00</authored-date>
    <message>doc fix</message>
    <tree>1c52449e8c69df12f7db3fe058490ea3fbf1b078</tree>
    <committer>
      <name>Travis Tilley</name>
      <email>ttilley@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>dfc2874972daf601f3eeb4cd2bff589290cc2521</id>
      </parent>
    </parents>
    <author>
      <name>Petrica Ghiurca</name>
      <email>petrica@ghiurca.net</email>
    </author>
    <url>http://github.com/rubyist/aasm/commit/404a9d31036be314490daecd857395d9ba40c415</url>
    <id>404a9d31036be314490daecd857395d9ba40c415</id>
    <committed-date>2009-10-08T03:05:21-07:00</committed-date>
    <authored-date>2009-10-08T03:05:21-07:00</authored-date>
    <message>support for multiple events for enter/exit states</message>
    <tree>36880e7cd992818917419a7e247a4e68ba8778f9</tree>
    <committer>
      <name>Petrica Ghiurca</name>
      <email>petrica@ghiurca.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>1ab82879696b889eea9d91b489a87541ebb5c83d</id>
      </parent>
      <parent>
        <id>dfc2874972daf601f3eeb4cd2bff589290cc2521</id>
      </parent>
    </parents>
    <author>
      <name>Jacqui Maher</name>
      <email>jacqui@eastmedia.com</email>
    </author>
    <url>http://github.com/rubyist/aasm/commit/fe13954e9337ecc3a4196509c5e27a7c17bad33c</url>
    <id>fe13954e9337ecc3a4196509c5e27a7c17bad33c</id>
    <committed-date>2009-09-17T12:06:24-07:00</committed-date>
    <authored-date>2009-09-17T12:06:24-07:00</authored-date>
    <message>Fixed conflicts after merging with rubyist-aasm</message>
    <tree>47678b7f1526ca3afc4fd4057917f5839dc0b566</tree>
    <committer>
      <name>Jacqui Maher</name>
      <email>jacqui@eastmedia.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>7a1c70158c67113bc1c8dd6bd6dbd327af150648</id>
      </parent>
    </parents>
    <author>
      <name>rubyist</name>
      <email>scott@elitists.net</email>
    </author>
    <url>http://github.com/rubyist/aasm/commit/dfc2874972daf601f3eeb4cd2bff589290cc2521</url>
    <id>dfc2874972daf601f3eeb4cd2bff589290cc2521</id>
    <committed-date>2009-09-05T19:54:52-07:00</committed-date>
    <authored-date>2009-09-05T19:54:52-07:00</authored-date>
    <message>Correct official fork in README [herestomwiththeweather]</message>
    <tree>dbf9c907cf3ba5ff0a8fbbe697a9424b681a71b1</tree>
    <committer>
      <name>rubyist</name>
      <email>scott@elitists.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>1e4c038eeec9c6a2a751196a9e36f165e144b721</id>
      </parent>
      <parent>
        <id>6596b98a5375f0898e62a055a8a3eb9c93a1cdbe</id>
      </parent>
    </parents>
    <author>
      <name>Travis Tilley</name>
      <email>ttilley@gmail.com</email>
    </author>
    <url>http://github.com/rubyist/aasm/commit/7a1c70158c67113bc1c8dd6bd6dbd327af150648</url>
    <id>7a1c70158c67113bc1c8dd6bd6dbd327af150648</id>
    <committed-date>2009-08-08T14:01:56-07:00</committed-date>
    <authored-date>2009-08-08T14:01:56-07:00</authored-date>
    <message>Merge branch 'master' of git://github.com/rubyist/aasm

Conflicts:
	aasm.gemspec
	lib/aasm/aasm.rb
	spec/spec_helper.rb</message>
    <tree>7f4bfd23e6d131440c0aaa71e72b61c898c43ad6</tree>
    <committer>
      <name>Travis Tilley</name>
      <email>ttilley@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>904b6b43d63c90528d6295bba88e0ca0fc0142ba</id>
      </parent>
    </parents>
    <author>
      <name>Travis Tilley</name>
      <email>ttilley@gmail.com</email>
    </author>
    <url>http://github.com/rubyist/aasm/commit/1e4c038eeec9c6a2a751196a9e36f165e144b721</url>
    <id>1e4c038eeec9c6a2a751196a9e36f165e144b721</id>
    <committed-date>2009-08-08T13:53:47-07:00</committed-date>
    <authored-date>2009-08-08T13:53:47-07:00</authored-date>
    <message>reorganize to match rubyist/aasm</message>
    <tree>105b379858def1e55f558c977ba34a8fdfe6cd22</tree>
    <committer>
      <name>Travis Tilley</name>
      <email>ttilley@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>10a1f8f30bb519d52328f812e51b39262a95b17c</id>
      </parent>
    </parents>
    <author>
      <name>Scott Barron</name>
      <email>scott@elitists.net</email>
    </author>
    <url>http://github.com/rubyist/aasm/commit/904b6b43d63c90528d6295bba88e0ca0fc0142ba</url>
    <id>904b6b43d63c90528d6295bba88e0ca0fc0142ba</id>
    <committed-date>2009-08-08T13:28:21-07:00</committed-date>
    <authored-date>2009-08-08T06:36:19-07:00</authored-date>
    <message>Handle inheritance properly, there was different behavior depending on whether or not AASM was included in the child class or not.
(cherry picked from commit 48ff9a50dc9e1d605fce67e5de85286d63a69229)</message>
    <tree>8c1269f005d717cd87d23e44dfbe6582133c8252</tree>
    <committer>
      <name>Travis Tilley</name>
      <email>ttilley@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>0f90e5a680c6ba13f101bc06094ec1ea6b89d63f</id>
      </parent>
    </parents>
    <author>
      <name>Scott Barron</name>
      <email>scott@elitists.net</email>
    </author>
    <url>http://github.com/rubyist/aasm/commit/6596b98a5375f0898e62a055a8a3eb9c93a1cdbe</url>
    <id>6596b98a5375f0898e62a055a8a3eb9c93a1cdbe</id>
    <committed-date>2009-08-08T07:56:44-07:00</committed-date>
    <authored-date>2009-08-08T07:56:44-07:00</authored-date>
    <message>reorganize things a bit</message>
    <tree>c72a57f5799f54a48732b55a5cd7d88a20c1a7f2</tree>
    <committer>
      <name>Scott Barron</name>
      <email>scott@elitists.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>64ed2a72a6afc0462353cd562ec060d103fe4ac1</id>
      </parent>
    </parents>
    <author>
      <name>Scott Barron</name>
      <email>scott@elitists.net</email>
    </author>
    <url>http://github.com/rubyist/aasm/commit/0f90e5a680c6ba13f101bc06094ec1ea6b89d63f</url>
    <id>0f90e5a680c6ba13f101bc06094ec1ea6b89d63f</id>
    <committed-date>2009-08-08T06:39:11-07:00</committed-date>
    <authored-date>2009-08-08T06:39:11-07:00</authored-date>
    <message>bump version and fix gemspec</message>
    <tree>d7bcc2f02b5b282b278588adf38bea1f0117cb0a</tree>
    <committer>
      <name>Scott Barron</name>
      <email>scott@elitists.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>48ff9a50dc9e1d605fce67e5de85286d63a69229</id>
      </parent>
      <parent>
        <id>baceb4b53e296cd45ac3acbd5df291e14b2993aa</id>
      </parent>
    </parents>
    <author>
      <name>Scott Barron</name>
      <email>scott@elitists.net</email>
    </author>
    <url>http://github.com/rubyist/aasm/commit/64ed2a72a6afc0462353cd562ec060d103fe4ac1</url>
    <id>64ed2a72a6afc0462353cd562ec060d103fe4ac1</id>
    <committed-date>2009-08-08T06:37:38-07:00</committed-date>
    <authored-date>2009-08-08T06:37:38-07:00</authored-date>
    <message>Merge branch 'master' of git@github.com:rubyist/aasm</message>
    <tree>609fb0679fd5aa718367feb852c46c1ef92360b1</tree>
    <committer>
      <name>Scott Barron</name>
      <email>scott@elitists.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>5aff31982d044cd532751908725b7535af88e93a</id>
      </parent>
    </parents>
    <author>
      <name>Scott Barron</name>
      <email>scott@elitists.net</email>
    </author>
    <url>http://github.com/rubyist/aasm/commit/48ff9a50dc9e1d605fce67e5de85286d63a69229</url>
    <id>48ff9a50dc9e1d605fce67e5de85286d63a69229</id>
    <committed-date>2009-08-08T06:36:19-07:00</committed-date>
    <authored-date>2009-08-08T06:36:19-07:00</authored-date>
    <message>Handle inheritance properly, there was different behavior depending on whether or not AASM was included in the child class or not.</message>
    <tree>ef789e33c3594ed8f2a0652ebd09195fca49a071</tree>
    <committer>
      <name>Scott Barron</name>
      <email>scott@elitists.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>294b1ba15a2a66341d6b83ac46e69540991ebaba</id>
      </parent>
    </parents>
    <author>
      <name>Travis Tilley</name>
      <email>ttilley@recyclebank.com</email>
    </author>
    <url>http://github.com/rubyist/aasm/commit/10a1f8f30bb519d52328f812e51b39262a95b17c</url>
    <id>10a1f8f30bb519d52328f812e51b39262a95b17c</id>
    <committed-date>2009-06-07T00:49:39-07:00</committed-date>
    <authored-date>2009-06-07T00:49:39-07:00</authored-date>
    <message>make documentation reflect reality</message>
    <tree>eaa574b883736257b222c6ae94679b2c83d4f769</tree>
    <committer>
      <name>Travis Tilley</name>
      <email>ttilley@recyclebank.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>439a5f99a47a1bf626b7952d9eb94be7212c0512</id>
      </parent>
    </parents>
    <author>
      <name>Travis Tilley</name>
      <email>ttilley@recyclebank.com</email>
    </author>
    <url>http://github.com/rubyist/aasm/commit/294b1ba15a2a66341d6b83ac46e69540991ebaba</url>
    <id>294b1ba15a2a66341d6b83ac46e69540991ebaba</id>
    <committed-date>2009-06-07T00:41:04-07:00</committed-date>
    <authored-date>2009-06-07T00:41:04-07:00</authored-date>
    <message>make spec match reality</message>
    <tree>eb773270add8b19392b75d35ff3dcd48bd3ec779</tree>
    <committer>
      <name>Travis Tilley</name>
      <email>ttilley@recyclebank.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>6c4d3b7f40ea73b48b8fb4b65978523c462088c1</id>
      </parent>
      <parent>
        <id>923175e9e95d4b1db0ba639bcc28bc747bd39413</id>
      </parent>
    </parents>
    <author>
      <name>Travis Tilley</name>
      <email>ttilley@recyclebank.com</email>
    </author>
    <url>http://github.com/rubyist/aasm/commit/439a5f99a47a1bf626b7952d9eb94be7212c0512</url>
    <id>439a5f99a47a1bf626b7952d9eb94be7212c0512</id>
    <committed-date>2009-06-07T00:26:12-07:00</committed-date>
    <authored-date>2009-06-07T00:26:12-07:00</authored-date>
    <message>Merge branch 'dunedain289/master'

Conflicts:
	aasm.gemspec
	lib/aasm.rb
	lib/event.rb

The new event transition specs don't pass. I need to look into this.</message>
    <tree>71fa60f4abc5199aef5e35e4685cde33dede8f60</tree>
    <committer>
      <name>Travis Tilley</name>
      <email>ttilley@recyclebank.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>c323e8a3b0af1a5702143a245145b5b40e0b77da</id>
      </parent>
    </parents>
    <author>
      <name>Travis Tilley</name>
      <email>ttilley@recyclebank.com</email>
    </author>
    <url>http://github.com/rubyist/aasm/commit/6c4d3b7f40ea73b48b8fb4b65978523c462088c1</url>
    <id>6c4d3b7f40ea73b48b8fb4b65978523c462088c1</id>
    <committed-date>2009-05-27T17:46:29-07:00</committed-date>
    <authored-date>2009-05-27T17:46:29-07:00</authored-date>
    <message>...lets try this again</message>
    <tree>8e43ac247351cd564d3080b371cff8b83fcf60a4</tree>
    <committer>
      <name>Travis Tilley</name>
      <email>ttilley@recyclebank.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>f62693b70c4d43beeaeda1f9e0b330716eba0003</id>
      </parent>
    </parents>
    <author>
      <name>Travis Tilley</name>
      <email>ttilley@recyclebank.com</email>
    </author>
    <url>http://github.com/rubyist/aasm/commit/c323e8a3b0af1a5702143a245145b5b40e0b77da</url>
    <id>c323e8a3b0af1a5702143a245145b5b40e0b77da</id>
    <committed-date>2009-05-27T17:33:04-07:00</committed-date>
    <authored-date>2009-05-27T17:12:25-07:00</authored-date>
    <message>bump version</message>
    <tree>5a8e28d23c0d7c78005fc8e2552e920b0020b5ad</tree>
    <committer>
      <name>Travis Tilley</name>
      <email>ttilley@recyclebank.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>15915ad6e7ab31793e034b5d90573f03f91549f3</id>
      </parent>
    </parents>
    <author>
      <name>Travis Tilley</name>
      <email>ttilley@recyclebank.com</email>
    </author>
    <url>http://github.com/rubyist/aasm/commit/f62693b70c4d43beeaeda1f9e0b330716eba0003</url>
    <id>f62693b70c4d43beeaeda1f9e0b330716eba0003</id>
    <committed-date>2009-05-27T17:33:04-07:00</committed-date>
    <authored-date>2009-05-27T17:32:02-07:00</authored-date>
    <message>whitespace ninja</message>
    <tree>57f868df76c14ec6f36143f64f7e022c1eacacb1</tree>
    <committer>
      <name>Travis Tilley</name>
      <email>ttilley@recyclebank.com</email>
    </committer>
  </commit>
</commits>
