<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array"/>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>ce80ffcf21d8d7f2850833e5408136fd27d433bd</id>
    </parent>
    <parent>
      <id>8888651be8d6656bdf2378731d91a8badbaa2556</id>
    </parent>
  </parents>
  <author>
    <name>Matthew Beale</name>
    <email>mixonic@synitech.com</email>
  </author>
  <url>http://github.com/artofmission/will_paginate/commit/50d2294926311c64657bcf547fe28e5420a31e25</url>
  <id>50d2294926311c64657bcf547fe28e5420a31e25</id>
  <committed-date>2009-04-02T17:22:36-07:00</committed-date>
  <authored-date>2009-04-02T17:22:36-07:00</authored-date>
  <message>Merge conflict</message>
  <tree>3a1fc15a5484d07df8842a59155144ebc476aee3</tree>
  <committer>
    <name>Matthew Beale</name>
    <email>mixonic@synitech.com</email>
  </committer>
</commit>
