<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array"/>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>2032f494b926e7d4d5bef47748ec8acac25e4da9</id>
    </parent>
    <parent>
      <id>1bdc6eeb899fb1ecd98691207316e403eb17f370</id>
    </parent>
  </parents>
  <author>
    <name>Yehuda Katz</name>
    <email>wycats@gmail.com</email>
  </author>
  <url>http://github.com/wycats/merb-core/commit/1fd7a9ccc0d4ff11a961038d882d724a5725595b</url>
  <id>1fd7a9ccc0d4ff11a961038d882d724a5725595b</id>
  <committed-date>2008-06-11T21:59:28-07:00</committed-date>
  <authored-date>2008-06-11T21:59:28-07:00</authored-date>
  <message>Merge branch 'master' of git@github.com:wycats/merb-core

* 'master' of git@github.com:wycats/merb-core:
  make the default rake task 'specs' so running rake in merb-core just runs the specs
  Rename @status to @_status
  Avoid adding nil values in place of missing keys for Hash#only
  Fix issue with null segments
  Fixed session cookie expires value [#366 state:resolved]
  Made HTTP method override proc-based and pluggable. [#364]</message>
  <tree>335d3a41b2784e9bc2abd02f69d90a34722f31d7</tree>
  <committer>
    <name>Yehuda Katz</name>
    <email>wycats@gmail.com</email>
  </committer>
</commit>
