<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array"/>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>f409ec3ecb04593c400ac3217be9ef44ed25cdd6</id>
    </parent>
    <parent>
      <id>89e9ea91e9e83d844096a0a5861991e29b870dba</id>
    </parent>
  </parents>
  <author>
    <name>Bryan Helmkamp</name>
    <email>bryan@brynary.com</email>
  </author>
  <url>http://github.com/brynary/webrat/commit/29274f9b4b49f98a6d69f43d1b3a309146912bc3</url>
  <id>29274f9b4b49f98a6d69f43d1b3a309146912bc3</id>
  <committed-date>2008-12-28T16:35:42-08:00</committed-date>
  <authored-date>2008-12-28T16:35:42-08:00</authored-date>
  <message>Merge commit 'joshknowles/master'

Conflicts:
	lib/webrat/rails.rb
	spec/webrat/rails/rails_session_spec.rb</message>
  <tree>b787b912e27d12a1e347478e6866e6091b7b86f0</tree>
  <committer>
    <name>Bryan Helmkamp</name>
    <email>bryan@brynary.com</email>
  </committer>
</commit>
