<?xml version="1.0" encoding="UTF-8"?>
<commits type="array">
  <commit>
    <parents type="array">
      <parent>
        <id>2657c8034974f5d6cda0938139e1f3664ce25ba2</id>
      </parent>
    </parents>
    <author>
      <name>Michael D. Ivey</name>
      <email>ivey@gweezlebur.com</email>
    </author>
    <url>http://github.com/wycats/merb-core/commit/febd7a4bd871801cc1bcd3c8bed4cbf8c2ae96d9</url>
    <id>febd7a4bd871801cc1bcd3c8bed4cbf8c2ae96d9</id>
    <committed-date>2008-05-04T17:49:15-07:00</committed-date>
    <authored-date>2008-05-04T17:49:15-07:00</authored-date>
    <message>0.9.3 changelog</message>
    <tree>3b1a08d00d348f10cdfdbeb38b50ea7e08c34022</tree>
    <committer>
      <name>Michael D. Ivey</name>
      <email>ivey@gweezlebur.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>dc540241b2c5361e84502bef2f38f98846f05796</id>
      </parent>
    </parents>
    <author>
      <name>Michael D. Ivey</name>
      <email>ivey@gweezlebur.com</email>
    </author>
    <url>http://github.com/wycats/merb-core/commit/2657c8034974f5d6cda0938139e1f3664ce25ba2</url>
    <id>2657c8034974f5d6cda0938139e1f3664ce25ba2</id>
    <committed-date>2008-05-04T14:03:31-07:00</committed-date>
    <authored-date>2008-05-04T13:59:59-07:00</authored-date>
    <message>Remove special case for dm-core in use_orm

merb_datamapper is now maintained by the DataMapper folks, and they don't call
it dm-merb anymore.  Removed the resolve_orm_plugin_name() method and now
just use merb_#{orm}</message>
    <tree>4891a68c5caa7f08993a261fafb0e3420c85afe5</tree>
    <committer>
      <name>Michael D. Ivey</name>
      <email>ivey@gweezlebur.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>8823e0a06e1b4b5f49da3f0e37b3ac609992c5fe</id>
      </parent>
    </parents>
    <author>
      <name>Ezra Zygmuntowicz</name>
      <email>ez@engineyard.com</email>
    </author>
    <url>http://github.com/wycats/merb-core/commit/dc540241b2c5361e84502bef2f38f98846f05796</url>
    <id>dc540241b2c5361e84502bef2f38f98846f05796</id>
    <committed-date>2008-05-04T13:58:38-07:00</committed-date>
    <authored-date>2008-05-04T13:58:38-07:00</authored-date>
    <message>removing __app_file_trace__  since it doesn't work.</message>
    <tree>726d8d349851b2e5e76bca08a2a2e6c3949bf14d</tree>
    <committer>
      <name>Ezra Zygmuntowicz</name>
      <email>ez@engineyard.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>16bfc044b815988b21c7bb90207d957b62e8d21b</id>
      </parent>
      <parent>
        <id>ef185e8b21f9a27cd97a81eeb26b8763a4ddd51a</id>
      </parent>
    </parents>
    <author>
      <name>Michael S. Klishin</name>
      <email>michael@novemberain.com</email>
    </author>
    <url>http://github.com/wycats/merb-core/commit/8823e0a06e1b4b5f49da3f0e37b3ac609992c5fe</url>
    <id>8823e0a06e1b4b5f49da3f0e37b3ac609992c5fe</id>
    <committed-date>2008-05-04T05:51:31-07:00</committed-date>
    <authored-date>2008-05-04T05:51:31-07:00</authored-date>
    <message>Merge branch 'master' of git@github.com:wycats/merb-core into wycats

* 'master' of git@github.com:wycats/merb-core:
  Allow http status to be a symbol - refactored String snake_case method</message>
    <tree>4afeff498e23a9115c88a201554cc12495487332</tree>
    <committer>
      <name>Michael S. Klishin</name>
      <email>michael@novemberain.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>ee4010a42e58bdf3b148cbb725680908f7898d80</id>
      </parent>
    </parents>
    <author>
      <name>Michael S. Klishin</name>
      <email>michael@novemberain.com</email>
    </author>
    <url>http://github.com/wycats/merb-core/commit/16bfc044b815988b21c7bb90207d957b62e8d21b</url>
    <id>16bfc044b815988b21c7bb90207d957b62e8d21b</id>
    <committed-date>2008-05-04T05:49:53-07:00</committed-date>
    <authored-date>2008-05-04T05:49:53-07:00</authored-date>
    <message>Add Emacs TAGS to ignore</message>
    <tree>c3fb72f7003e47208b83086922e740758e6e3cb0</tree>
    <committer>
      <name>Michael S. Klishin</name>
      <email>michael@novemberain.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>fffde1570f8f4c82d433e95350da79101396b1f6</id>
      </parent>
    </parents>
    <author>
      <name>Michael S. Klishin</name>
      <email>michael@novemberain.com</email>
    </author>
    <url>http://github.com/wycats/merb-core/commit/ee4010a42e58bdf3b148cbb725680908f7898d80</url>
    <id>ee4010a42e58bdf3b148cbb725680908f7898d80</id>
    <committed-date>2008-05-04T05:48:55-07:00</committed-date>
    <authored-date>2008-05-04T05:48:55-07:00</authored-date>
    <message>Explain Merb application layouts in documentation.</message>
    <tree>0c09685020f83094b3404d209443b5b20ca20156</tree>
    <committer>
      <name>Michael S. Klishin</name>
      <email>michael@novemberain.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>2e673fbb7e4db064824af6e2aa3552149313d7fc</id>
      </parent>
      <parent>
        <id>fffde1570f8f4c82d433e95350da79101396b1f6</id>
      </parent>
    </parents>
    <author>
      <name>Fabien Franzen</name>
      <email>info@atelierfabien.be</email>
    </author>
    <url>http://github.com/wycats/merb-core/commit/ef185e8b21f9a27cd97a81eeb26b8763a4ddd51a</url>
    <id>ef185e8b21f9a27cd97a81eeb26b8763a4ddd51a</id>
    <committed-date>2008-05-04T03:18:43-07:00</committed-date>
    <authored-date>2008-05-04T03:18:43-07:00</authored-date>
    <message>Merge branch 'master' of git@github.com:wycats/merb-core</message>
    <tree>5faf284184ecc9c96ccfcfde5cc1937ab1d47b8e</tree>
    <committer>
      <name>Fabien Franzen</name>
      <email>info@atelierfabien.be</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>65dc024eb6551bec259c9b971fb1a083b999e298</id>
      </parent>
    </parents>
    <author>
      <name>Fabien Franzen</name>
      <email>info@atelierfabien.be</email>
    </author>
    <url>http://github.com/wycats/merb-core/commit/2e673fbb7e4db064824af6e2aa3552149313d7fc</url>
    <id>2e673fbb7e4db064824af6e2aa3552149313d7fc</id>
    <committed-date>2008-05-04T03:18:22-07:00</committed-date>
    <authored-date>2008-05-04T03:18:22-07:00</authored-date>
    <message>Allow http status to be a symbol - refactored String snake_case method

It's now possible to assign a Merb Controller's status-code using a symbol,
thanks to a proper Exceptions::STATUS_CODES lookup hash.

Along the way this uncovered some flaws in the current snake_case method. With
some help from mattetti a new version was crafted that's a bit faster than
my original implementation. Two or more capitals in a row are now kept together,
which means that previously 'CNNNews'.snake_case would become 'c_n_n_news',
whereas now, it will be what you'd expect: 'cnn_news'.</message>
    <tree>8cdcb7b726bc82eda5e90806012b0b1974fc309b</tree>
    <committer>
      <name>Fabien Franzen</name>
      <email>info@atelierfabien.be</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>f35001ff89ff452ca1ac09cca3274cbd2912ffc4</id>
      </parent>
    </parents>
    <author>
      <name>Michael S. Klishin</name>
      <email>michael@novemberain.com</email>
    </author>
    <url>http://github.com/wycats/merb-core/commit/fffde1570f8f4c82d433e95350da79101396b1f6</url>
    <id>fffde1570f8f4c82d433e95350da79101396b1f6</id>
    <committed-date>2008-05-04T00:16:10-07:00</committed-date>
    <authored-date>2008-05-04T00:16:10-07:00</authored-date>
    <message>Explain how to set up /lib autoload in documentation.</message>
    <tree>346fd4da20901a53be178130d992b8c5261cd3d9</tree>
    <committer>
      <name>Michael S. Klishin</name>
      <email>michael@novemberain.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>7f8f593329676577dd7588bb9dca9a889ae7b1d7</id>
      </parent>
      <parent>
        <id>76f58a0c22c40e3d86dc7fd7b4601abbfa0fa4d5</id>
      </parent>
    </parents>
    <author>
      <name>Michael S. Klishin</name>
      <email>michael@novemberain.com</email>
    </author>
    <url>http://github.com/wycats/merb-core/commit/f35001ff89ff452ca1ac09cca3274cbd2912ffc4</url>
    <id>f35001ff89ff452ca1ac09cca3274cbd2912ffc4</id>
    <committed-date>2008-05-03T19:59:06-07:00</committed-date>
    <authored-date>2008-05-03T19:59:06-07:00</authored-date>
    <message>Merge branch 'master' of git@github.com:wycats/merb-core into wycats

* 'master' of git@github.com:wycats/merb-core:
  Make change_priveledge actually work
  bump merb-core version to 0.9.3 in prep for release.
  Add new -R/--rackup option to the full(-ish) list of options.
  Provide opts for alternate rackup config path. This is consistent with --rackup option for thin and gives a little more freedom to specify the rackup config (instead of being forced to rack.rb).
  Testing Merb::Test::RequestHelper#request method to properly handle namespaced routes
  test request helpers support namespaced routes
  Added parentheses to be_kind_of to get rid of warnings when running application_spec.rb
  Fixing pidfiles glob on cluster and pidfile argument
  replaced nested 'if' with an 'elseif'
  params array serialization</message>
    <tree>8bf820bafbec6eb0d27701b53f48a6101cce0c9c</tree>
    <committer>
      <name>Michael S. Klishin</name>
      <email>michael@novemberain.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>770bf3caabf070769d14a0e26e4f1792cffa2737</id>
      </parent>
    </parents>
    <author>
      <name>Ezra Zygmuntowicz</name>
      <email>ez@engineyard.com</email>
    </author>
    <url>http://github.com/wycats/merb-core/commit/76f58a0c22c40e3d86dc7fd7b4601abbfa0fa4d5</url>
    <id>76f58a0c22c40e3d86dc7fd7b4601abbfa0fa4d5</id>
    <committed-date>2008-05-03T18:21:08-07:00</committed-date>
    <authored-date>2008-05-03T18:21:08-07:00</authored-date>
    <message>Make change_priveledge actually work</message>
    <tree>37ee46b92802d5bc62ed1f7b2c607868a99cd6d8</tree>
    <committer>
      <name>Ezra Zygmuntowicz</name>
      <email>ez@engineyard.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>d1d534d78a8549fb76b9714cd7ada6eb699786d3</id>
      </parent>
    </parents>
    <author>
      <name>Ezra Zygmuntowicz</name>
      <email>ez@engineyard.com</email>
    </author>
    <url>http://github.com/wycats/merb-core/commit/770bf3caabf070769d14a0e26e4f1792cffa2737</url>
    <id>770bf3caabf070769d14a0e26e4f1792cffa2737</id>
    <committed-date>2008-05-03T17:31:39-07:00</committed-date>
    <authored-date>2008-05-03T17:31:39-07:00</authored-date>
    <message>bump merb-core version to 0.9.3 in prep for release.</message>
    <tree>d9be9a4a7cb275d329a0c80e03f28b08c20c577a</tree>
    <committer>
      <name>Ezra Zygmuntowicz</name>
      <email>ez@engineyard.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>d9f42d9004623df64b29fb2b96c05a7a4b5c8025</id>
      </parent>
      <parent>
        <id>f08bd8868ba3dac4b402006211e9f784fd4de830</id>
      </parent>
    </parents>
    <author>
      <name>Ezra Zygmuntowicz</name>
      <email>ez@engineyard.com</email>
    </author>
    <url>http://github.com/wycats/merb-core/commit/d1d534d78a8549fb76b9714cd7ada6eb699786d3</url>
    <id>d1d534d78a8549fb76b9714cd7ada6eb699786d3</id>
    <committed-date>2008-05-03T16:50:53-07:00</committed-date>
    <authored-date>2008-05-03T16:50:53-07:00</authored-date>
    <message>Merge branch 'pidfiles_cluster_fix' of git://github.com/gabriel/merb-core</message>
    <tree>edc8ca0bd77468c97e2a94f32a997d45390e6628</tree>
    <committer>
      <name>Ezra Zygmuntowicz</name>
      <email>ez@engineyard.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>ae200b7dbe4ad5e1629617f99a16c94d3acd10bf</id>
      </parent>
    </parents>
    <author>
      <name>Michael S. Klishin</name>
      <email>michael@novemberain.com</email>
    </author>
    <url>http://github.com/wycats/merb-core/commit/d9f42d9004623df64b29fb2b96c05a7a4b5c8025</url>
    <id>d9f42d9004623df64b29fb2b96c05a7a4b5c8025</id>
    <committed-date>2008-05-03T01:03:13-07:00</committed-date>
    <authored-date>2008-05-03T01:03:13-07:00</authored-date>
    <message>Add new -R/--rackup option to the full(-ish) list of options.</message>
    <tree>8a6558c91f0c1713940793905de9f6be02f206ce</tree>
    <committer>
      <name>Michael S. Klishin</name>
      <email>michael@novemberain.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>4b7318104e94b7b404fff4140e2bf2e94b53a278</id>
      </parent>
    </parents>
    <author>
      <name>Gabe</name>
      <email>gabrielh@gmail.com</email>
    </author>
    <url>http://github.com/wycats/merb-core/commit/ae200b7dbe4ad5e1629617f99a16c94d3acd10bf</url>
    <id>ae200b7dbe4ad5e1629617f99a16c94d3acd10bf</id>
    <committed-date>2008-05-03T00:48:42-07:00</committed-date>
    <authored-date>2008-05-01T09:24:44-07:00</authored-date>
    <message>Provide opts for alternate rackup config path. This is consistent with --rackup option for thin and gives a little more freedom to specify the rackup config (instead of being forced to rack.rb).

Signed-off-by: Michael S. Klishin &lt;michael@novemberain.com&gt;</message>
    <tree>3aaa26727ef3c91d01f3a02ba0f8c94e33646709</tree>
    <committer>
      <name>Michael S. Klishin</name>
      <email>michael@novemberain.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>b927b3861cf450f7ccea4a1a487e7ef5e9bfacf5</id>
      </parent>
    </parents>
    <author>
      <name>Tim Kofol</name>
      <email>tkofol@gmail.com</email>
    </author>
    <url>http://github.com/wycats/merb-core/commit/4b7318104e94b7b404fff4140e2bf2e94b53a278</url>
    <id>4b7318104e94b7b404fff4140e2bf2e94b53a278</id>
    <committed-date>2008-05-03T00:25:45-07:00</committed-date>
    <authored-date>2008-05-02T10:54:11-07:00</authored-date>
    <message>Testing Merb::Test::RequestHelper#request method to properly handle namespaced routes

Signed-off-by: Michael S. Klishin &lt;michael@novemberain.com&gt;</message>
    <tree>83f245767d2b4bfad34421dc35e83fe6dfb922a6</tree>
    <committer>
      <name>Michael S. Klishin</name>
      <email>michael@novemberain.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>88f02d08cb86bc148edaadf4101cd36a7beccffb</id>
      </parent>
    </parents>
    <author>
      <name>Tim Kofol</name>
      <email>tkofol@gmail.com</email>
    </author>
    <url>http://github.com/wycats/merb-core/commit/b927b3861cf450f7ccea4a1a487e7ef5e9bfacf5</url>
    <id>b927b3861cf450f7ccea4a1a487e7ef5e9bfacf5</id>
    <committed-date>2008-05-03T00:25:41-07:00</committed-date>
    <authored-date>2008-04-18T07:36:52-07:00</authored-date>
    <message>test request helpers support namespaced routes

Signed-off-by: Michael S. Klishin &lt;michael@novemberain.com&gt;</message>
    <tree>dca50d9daeaa5a9a14c01c01805eed5c3fe0a2fd</tree>
    <committer>
      <name>Michael S. Klishin</name>
      <email>michael@novemberain.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>2c098c5cc536d847d2374c182015a71cde279ea7</id>
      </parent>
    </parents>
    <author>
      <name>Simon Jefford</name>
      <email>simon.jefford@gmail.com</email>
    </author>
    <url>http://github.com/wycats/merb-core/commit/88f02d08cb86bc148edaadf4101cd36a7beccffb</url>
    <id>88f02d08cb86bc148edaadf4101cd36a7beccffb</id>
    <committed-date>2008-05-03T00:09:00-07:00</committed-date>
    <authored-date>2008-04-14T11:37:47-07:00</authored-date>
    <message>Added parentheses to be_kind_of to get rid of warnings when running application_spec.rb

Signed-off-by: Michael S. Klishin &lt;michael@novemberain.com&gt;</message>
    <tree>956e1e845475616d85745b8a2b071386c44db94b</tree>
    <committer>
      <name>Michael S. Klishin</name>
      <email>michael@novemberain.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>2c098c5cc536d847d2374c182015a71cde279ea7</id>
      </parent>
    </parents>
    <author>
      <name>Gabe</name>
      <email>gabrielh@gmail.com</email>
    </author>
    <url>http://github.com/wycats/merb-core/commit/f08bd8868ba3dac4b402006211e9f784fd4de830</url>
    <id>f08bd8868ba3dac4b402006211e9f784fd4de830</id>
    <committed-date>2008-05-02T15:03:20-07:00</committed-date>
    <authored-date>2008-05-02T15:03:20-07:00</authored-date>
    <message>Fixing pidfiles glob on cluster and pidfile argument</message>
    <tree>f15442c26cb5bfd9279849c8aceebe9faaf4d522</tree>
    <committer>
      <name>Gabe</name>
      <email>gabrielh@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>ef44141e6e055d363b37703113e26711bbd37b3c</id>
      </parent>
    </parents>
    <author>
      <name>Ben Burkert</name>
      <email>ben@benburkert.com</email>
    </author>
    <url>http://github.com/wycats/merb-core/commit/2c098c5cc536d847d2374c182015a71cde279ea7</url>
    <id>2c098c5cc536d847d2374c182015a71cde279ea7</id>
    <committed-date>2008-05-02T13:59:46-07:00</committed-date>
    <authored-date>2008-05-02T13:59:46-07:00</authored-date>
    <message>replaced nested 'if' with an 'elseif'</message>
    <tree>0d53b6343498c45862633eab58c91fa36cacb85b</tree>
    <committer>
      <name>Ben Burkert</name>
      <email>ben@benburkert.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>f7d2a4865d4123785bcabed2263e1dbb7ef14b17</id>
      </parent>
    </parents>
    <author>
      <name>William Smith</name>
      <email>BrianTheCoder</email>
    </author>
    <url>http://github.com/wycats/merb-core/commit/ef44141e6e055d363b37703113e26711bbd37b3c</url>
    <id>ef44141e6e055d363b37703113e26711bbd37b3c</id>
    <committed-date>2008-05-02T13:51:49-07:00</committed-date>
    <authored-date>2008-05-02T12:07:49-07:00</authored-date>
    <message>params array serialization

Signed-off-by: Ben Burkert &lt;ben@benburkert.com&gt;</message>
    <tree>ace29a6009e89a998b2380d3d6762f58d14e928b</tree>
    <committer>
      <name>Ben Burkert</name>
      <email>ben@benburkert.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>7ea662050024e2e3b699f01f01f8aa8f480c94d5</id>
      </parent>
      <parent>
        <id>f7d2a4865d4123785bcabed2263e1dbb7ef14b17</id>
      </parent>
    </parents>
    <author>
      <name>Michael S. Klishin</name>
      <email>michael@novemberain.com</email>
    </author>
    <url>http://github.com/wycats/merb-core/commit/7f8f593329676577dd7588bb9dca9a889ae7b1d7</url>
    <id>7f8f593329676577dd7588bb9dca9a889ae7b1d7</id>
    <committed-date>2008-05-02T08:00:46-07:00</committed-date>
    <authored-date>2008-05-02T08:00:46-07:00</authored-date>
    <message>Merge branch 'master' into wycats

* master:
  Added handling of INT signal for Merb server in foreground mode</message>
    <tree>06b7869465c76c30a9d3f939d3f34c8b9ab2fd6b</tree>
    <committer>
      <name>Michael S. Klishin</name>
      <email>michael@novemberain.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>fe4c67143ca11a325ef4717e2fc347b19f65034a</id>
      </parent>
    </parents>
    <author>
      <name>brainopia</name>
      <email>ravwar@gmail.com</email>
    </author>
    <url>http://github.com/wycats/merb-core/commit/f7d2a4865d4123785bcabed2263e1dbb7ef14b17</url>
    <id>f7d2a4865d4123785bcabed2263e1dbb7ef14b17</id>
    <committed-date>2008-05-02T07:58:26-07:00</committed-date>
    <authored-date>2008-05-02T03:39:40-07:00</authored-date>
    <message>Added handling of INT signal for Merb server in foreground mode

Signed-off-by: Michael S. Klishin &lt;michael@novemberain.com&gt;</message>
    <tree>f66ed638afece3db799288605cf050300ec2e77f</tree>
    <committer>
      <name>Michael S. Klishin</name>
      <email>michael@novemberain.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>69f16dca75c22ec5ac1f3aca088975118d8ede75</id>
      </parent>
      <parent>
        <id>fe4c67143ca11a325ef4717e2fc347b19f65034a</id>
      </parent>
    </parents>
    <author>
      <name>Michael S. Klishin</name>
      <email>michael@novemberain.com</email>
    </author>
    <url>http://github.com/wycats/merb-core/commit/7ea662050024e2e3b699f01f01f8aa8f480c94d5</url>
    <id>7ea662050024e2e3b699f01f01f8aa8f480c94d5</id>
    <committed-date>2008-05-02T05:30:52-07:00</committed-date>
    <authored-date>2008-05-02T05:30:52-07:00</authored-date>
    <message>Merge branch 'master' into wycats

* master:
  Remove redundant unescape for cookie string</message>
    <tree>64d3301e5b93a0555c7b435e32c256c45176d7fd</tree>
    <committer>
      <name>Michael S. Klishin</name>
      <email>michael@novemberain.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>af6683546d77001ed9db685f023071c69cd81376</id>
      </parent>
      <parent>
        <id>4759a463e6ac96e6ddaf6bc9758d7a0c7fc092fb</id>
      </parent>
    </parents>
    <author>
      <name>Michael S. Klishin</name>
      <email>michael@novemberain.com</email>
    </author>
    <url>http://github.com/wycats/merb-core/commit/69f16dca75c22ec5ac1f3aca088975118d8ede75</url>
    <id>69f16dca75c22ec5ac1f3aca088975118d8ede75</id>
    <committed-date>2008-05-02T05:30:24-07:00</committed-date>
    <authored-date>2008-05-02T05:30:24-07:00</authored-date>
    <message>Merge branch 'master' of git@github.com:wycats/merb-core into wycats

* 'master' of git@github.com:wycats/merb-core:
  Ensure that Merb::Logger doesn't try to close terminal streams.</message>
    <tree>bae3860ac92857d24bc672d0c810ad2c43fc32f5</tree>
    <committer>
      <name>Michael S. Klishin</name>
      <email>michael@novemberain.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>4759a463e6ac96e6ddaf6bc9758d7a0c7fc092fb</id>
      </parent>
    </parents>
    <author>
      <name>Kyle Drake</name>
      <email>kyledrake@gmail.com</email>
    </author>
    <url>http://github.com/wycats/merb-core/commit/fe4c67143ca11a325ef4717e2fc347b19f65034a</url>
    <id>fe4c67143ca11a325ef4717e2fc347b19f65034a</id>
    <committed-date>2008-05-02T05:30:14-07:00</committed-date>
    <authored-date>2008-05-02T00:53:45-07:00</authored-date>
    <message>Remove redundant unescape for cookie string

Signed-off-by: Michael S. Klishin &lt;michael@novemberain.com&gt;</message>
    <tree>6098d81d708c4f3c46c8e4da8b92a176a39f6462</tree>
    <committer>
      <name>Michael S. Klishin</name>
      <email>michael@novemberain.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>2ee84cf1afdfaf533d5f524a900f3441517e89bb</id>
      </parent>
    </parents>
    <author>
      <name>Nathan Weizenbaum</name>
      <email>nex342@gmail.com</email>
    </author>
    <url>http://github.com/wycats/merb-core/commit/4759a463e6ac96e6ddaf6bc9758d7a0c7fc092fb</url>
    <id>4759a463e6ac96e6ddaf6bc9758d7a0c7fc092fb</id>
    <committed-date>2008-05-02T00:00:20-07:00</committed-date>
    <authored-date>2008-03-27T00:23:22-07:00</authored-date>
    <message>Ensure that Merb::Logger doesn't try to close terminal streams.

Signed-off-by: Michael S. Klishin &lt;michael@novemberain.com&gt;</message>
    <tree>9b3ee6b460c40084e4af20ed4fc4836b1f5b6da8</tree>
    <committer>
      <name>Michael S. Klishin</name>
      <email>michael@novemberain.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>7f2316c9f4194f18dfbaac8c9d631aa363df2bed</id>
      </parent>
    </parents>
    <author>
      <name>Nathan Weizenbaum</name>
      <email>nex342@gmail.com</email>
    </author>
    <url>http://github.com/wycats/merb-core/commit/af6683546d77001ed9db685f023071c69cd81376</url>
    <id>af6683546d77001ed9db685f023071c69cd81376</id>
    <committed-date>2008-05-01T23:58:34-07:00</committed-date>
    <authored-date>2008-03-27T00:23:22-07:00</authored-date>
    <message>Ensure that Merb::Logger doesn't try to close terminal streams.

Signed-off-by: Michael S. Klishin &lt;michael@novemberain.com&gt;</message>
    <tree>bae3860ac92857d24bc672d0c810ad2c43fc32f5</tree>
    <committer>
      <name>Michael S. Klishin</name>
      <email>michael@novemberain.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>2ee84cf1afdfaf533d5f524a900f3441517e89bb</id>
      </parent>
    </parents>
    <author>
      <name>Guillaume Maury</name>
      <email>pm@gom-jabbar.org</email>
    </author>
    <url>http://github.com/wycats/merb-core/commit/7f2316c9f4194f18dfbaac8c9d631aa363df2bed</url>
    <id>7f2316c9f4194f18dfbaac8c9d631aa363df2bed</id>
    <committed-date>2008-05-01T23:50:37-07:00</committed-date>
    <authored-date>2008-04-25T22:25:16-07:00</authored-date>
    <message>Added support for multiple keys to designate a resource. For use with Datamapper composite keys support http://www.datamapper.org/articles/spotlight_on_cpk.html

Signed-off-by: Michael S. Klishin &lt;michael@novemberain.com&gt;</message>
    <tree>b0af0f8ca820bfef45d50e84abbcfb0eeef63e3f</tree>
    <committer>
      <name>Michael S. Klishin</name>
      <email>michael@novemberain.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>715b1200f0c92e6d6dd525694f235d1286f4414d</id>
      </parent>
    </parents>
    <author>
      <name>Michael S. Klishin</name>
      <email>michael@novemberain.com</email>
    </author>
    <url>http://github.com/wycats/merb-core/commit/2ee84cf1afdfaf533d5f524a900f3441517e89bb</url>
    <id>2ee84cf1afdfaf533d5f524a900f3441517e89bb</id>
    <committed-date>2008-05-01T23:38:11-07:00</committed-date>
    <authored-date>2008-05-01T23:38:11-07:00</authored-date>
    <message>Make Provide controller matcher doc conform to Merb standards.</message>
    <tree>61a8f9e3e8116827460267679c73cfe0d4f804a4</tree>
    <committer>
      <name>Michael S. Klishin</name>
      <email>michael@novemberain.com</email>
    </committer>
  </commit>
</commits>
