<?xml version="1.0" encoding="UTF-8"?>
<commits type="array">
  <commit>
    <parents type="array">
      <parent>
        <id>d758d996d1b66e2a65640f79f01ce2ac674d7ed5</id>
      </parent>
      <parent>
        <id>ca49299434bc764b667cd86846d892e91a150ef3</id>
      </parent>
    </parents>
    <author>
      <name>Pratik Naik</name>
      <email>pratiknaik@gmail.com</email>
    </author>
    <url>http://github.com/technoweenie/rails/commit/5f3f100ce2d689480da85abc88e5e940cf90189e</url>
    <id>5f3f100ce2d689480da85abc88e5e940cf90189e</id>
    <committed-date>2009-04-22T07:26:03-07:00</committed-date>
    <authored-date>2009-04-22T07:26:03-07:00</authored-date>
    <message>Merge branch 'master' into active_model

Conflicts:
	activeresource/lib/active_resource/validations.rb</message>
    <tree>15c1a05a5308a9eea56d7f0889ac46d9cac5b57c</tree>
    <committer>
      <name>Pratik Naik</name>
      <email>pratiknaik@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>a27192f49a7f41d74e5e68bce0c58d3923a79d77</id>
      </parent>
    </parents>
    <author>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </author>
    <url>http://github.com/technoweenie/rails/commit/ca49299434bc764b667cd86846d892e91a150ef3</url>
    <id>ca49299434bc764b667cd86846d892e91a150ef3</id>
    <committed-date>2009-04-22T01:02:54-07:00</committed-date>
    <authored-date>2009-04-22T01:02:54-07:00</authored-date>
    <message>Get Active Model in the mix</message>
    <tree>0b2055aea89fa65880b3d7e2e159d85146143767</tree>
    <committer>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>b70239b0cfb5ea8c00ff6375d007a924e21b4515</id>
      </parent>
    </parents>
    <author>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </author>
    <url>http://github.com/technoweenie/rails/commit/a27192f49a7f41d74e5e68bce0c58d3923a79d77</url>
    <id>a27192f49a7f41d74e5e68bce0c58d3923a79d77</id>
    <committed-date>2009-04-22T00:47:25-07:00</committed-date>
    <authored-date>2009-04-22T00:47:25-07:00</authored-date>
    <message>Divert CoreExtensions mention in docs</message>
    <tree>cedabb4aa8844c0a3c9769d37e24f15fdfa585bb</tree>
    <committer>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>35afad620bf4b005fda3415d026efc4d7d671246</id>
      </parent>
    </parents>
    <author>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </author>
    <url>http://github.com/technoweenie/rails/commit/b70239b0cfb5ea8c00ff6375d007a924e21b4515</url>
    <id>b70239b0cfb5ea8c00ff6375d007a924e21b4515</id>
    <committed-date>2009-04-22T00:45:39-07:00</committed-date>
    <authored-date>2009-04-22T00:40:14-07:00</authored-date>
    <message>Convert string extension modules to class reopens</message>
    <tree>891a768d2a721518fce259108f0b3c8b05df54f7</tree>
    <committer>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>e6eb941d1bd192e1fc6f5c17cbe1944d534ca67a</id>
      </parent>
    </parents>
    <author>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </author>
    <url>http://github.com/technoweenie/rails/commit/35afad620bf4b005fda3415d026efc4d7d671246</url>
    <id>35afad620bf4b005fda3415d026efc4d7d671246</id>
    <committed-date>2009-04-22T00:34:24-07:00</committed-date>
    <authored-date>2009-04-22T00:34:08-07:00</authored-date>
    <message>ActiveSupport.core_ext bridge util no longer used</message>
    <tree>472bb7a6e8db65cf064cbab72983e6bf517a0b78</tree>
    <committer>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>e9ed44af88fcffe75e1658e963e6dfb26b31edbe</id>
      </parent>
    </parents>
    <author>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </author>
    <url>http://github.com/technoweenie/rails/commit/e6eb941d1bd192e1fc6f5c17cbe1944d534ca67a</url>
    <id>e6eb941d1bd192e1fc6f5c17cbe1944d534ca67a</id>
    <committed-date>2009-04-22T00:33:00-07:00</committed-date>
    <authored-date>2009-04-22T00:33:00-07:00</authored-date>
    <message>Switch last module core extension to class reopen</message>
    <tree>82f3a22c0c4a2a004759767924e5dd1e29695db3</tree>
    <committer>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>5afc2abee66cda565f2cb890fe11c3d8e918d882</id>
      </parent>
      <parent>
        <id>6ee8329af6cd0c62945f216fae80fdd1679d477d</id>
      </parent>
    </parents>
    <author>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </author>
    <url>http://github.com/technoweenie/rails/commit/e9ed44af88fcffe75e1658e963e6dfb26b31edbe</url>
    <id>e9ed44af88fcffe75e1658e963e6dfb26b31edbe</id>
    <committed-date>2009-04-22T00:23:47-07:00</committed-date>
    <authored-date>2009-04-22T00:23:47-07:00</authored-date>
    <message>Merge branch 'master' into cherry</message>
    <tree>1a3c641f02b9b0b0bda0c85574f45c052ec62a03</tree>
    <committer>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>70c544df71dbea561d6136ecb13bee43cda64bd1</id>
      </parent>
      <parent>
        <id>380431e4ed12d184c4e4891fbb74fdc38a51d2f2</id>
      </parent>
    </parents>
    <author>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </author>
    <url>http://github.com/technoweenie/rails/commit/6ee8329af6cd0c62945f216fae80fdd1679d477d</url>
    <id>6ee8329af6cd0c62945f216fae80fdd1679d477d</id>
    <committed-date>2009-04-22T00:22:25-07:00</committed-date>
    <authored-date>2009-04-22T00:22:25-07:00</authored-date>
    <message>Merge branch 'master' of git@github.com:rails/rails</message>
    <tree>1fabd263901d757da326d20d20a3e7d1c9ca9e77</tree>
    <committer>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>f49e3441280380ec810d54bd5a77a7e699415efb</id>
      </parent>
    </parents>
    <author>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </author>
    <url>http://github.com/technoweenie/rails/commit/70c544df71dbea561d6136ecb13bee43cda64bd1</url>
    <id>70c544df71dbea561d6136ecb13bee43cda64bd1</id>
    <committed-date>2009-04-22T00:22:07-07:00</committed-date>
    <authored-date>2009-04-22T00:22:07-07:00</authored-date>
    <message>Rack::Utils.body_to_s doesn't exist in 1.0</message>
    <tree>8151931e11948d25988f8cb935cd3a40d6ab99e7</tree>
    <committer>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>0b92bb97c185f426585af770dcf43b67b0253f50</id>
      </parent>
    </parents>
    <author>
      <name>Joshua Peek</name>
      <email>josh@joshpeek.com</email>
    </author>
    <url>http://github.com/technoweenie/rails/commit/380431e4ed12d184c4e4891fbb74fdc38a51d2f2</url>
    <id>380431e4ed12d184c4e4891fbb74fdc38a51d2f2</id>
    <committed-date>2009-04-21T19:11:23-07:00</committed-date>
    <authored-date>2009-04-21T19:11:23-07:00</authored-date>
    <message>Fix test_rescue_routing_exceptions when running with rake</message>
    <tree>5c136e2770b03a0d389d7353db17039ad22d3e5a</tree>
    <committer>
      <name>Joshua Peek</name>
      <email>josh@joshpeek.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>fc5c1b0e901a735a68dd822608eec2f99b6c7b74</id>
      </parent>
    </parents>
    <author>
      <name>Joshua Peek</name>
      <email>josh@joshpeek.com</email>
    </author>
    <url>http://github.com/technoweenie/rails/commit/0b92bb97c185f426585af770dcf43b67b0253f50</url>
    <id>0b92bb97c185f426585af770dcf43b67b0253f50</id>
    <committed-date>2009-04-21T18:41:31-07:00</committed-date>
    <authored-date>2009-04-21T18:41:05-07:00</authored-date>
    <message>refactor some coupled rescue tests</message>
    <tree>9b1fdd311acc45ab8bb306296473248e160e5855</tree>
    <committer>
      <name>Joshua Peek</name>
      <email>josh@joshpeek.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>f49e3441280380ec810d54bd5a77a7e699415efb</id>
      </parent>
    </parents>
    <author>
      <name>Joshua Peek</name>
      <email>josh@joshpeek.com</email>
    </author>
    <url>http://github.com/technoweenie/rails/commit/fc5c1b0e901a735a68dd822608eec2f99b6c7b74</url>
    <id>fc5c1b0e901a735a68dd822608eec2f99b6c7b74</id>
    <committed-date>2009-04-21T17:57:18-07:00</committed-date>
    <authored-date>2009-04-19T15:51:23-07:00</authored-date>
    <message>Session tests belong under dispatch folder</message>
    <tree>22047a6d77df58f744503361207380ab98ee229b</tree>
    <committer>
      <name>Joshua Peek</name>
      <email>josh@joshpeek.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>696375ac628bd41edf3a8c8c00dde196696f4add</id>
      </parent>
      <parent>
        <id>f49e3441280380ec810d54bd5a77a7e699415efb</id>
      </parent>
    </parents>
    <author>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </author>
    <url>http://github.com/technoweenie/rails/commit/5afc2abee66cda565f2cb890fe11c3d8e918d882</url>
    <id>5afc2abee66cda565f2cb890fe11c3d8e918d882</id>
    <committed-date>2009-04-21T16:03:21-07:00</committed-date>
    <authored-date>2009-04-21T16:03:21-07:00</authored-date>
    <message>Merge branch 'master' into cherry</message>
    <tree>c1c2608af14e488435997fb5c5cfa39788fbbe3d</tree>
    <committer>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>504d16ccdfcd689eac31c1646957b06cc0ce55d1</id>
      </parent>
    </parents>
    <author>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </author>
    <url>http://github.com/technoweenie/rails/commit/f49e3441280380ec810d54bd5a77a7e699415efb</url>
    <id>f49e3441280380ec810d54bd5a77a7e699415efb</id>
    <committed-date>2009-04-21T16:02:30-07:00</committed-date>
    <authored-date>2009-04-21T16:02:30-07:00</authored-date>
    <message>Reinstate Base#render_to_string. Introduce AbstractController#render_to_string which stringifies render_to_body.</message>
    <tree>6d5578830513259a3a3df0d7480f2a1d3b46cacc</tree>
    <committer>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>7a99dc0ac2f36694b1cc11418129b8c39bb9044d</id>
      </parent>
    </parents>
    <author>
      <name>Alex Pooley</name>
      <email>alex@brownbeagle.com.au</email>
    </author>
    <url>http://github.com/technoweenie/rails/commit/504d16ccdfcd689eac31c1646957b06cc0ce55d1</url>
    <id>504d16ccdfcd689eac31c1646957b06cc0ce55d1</id>
    <committed-date>2009-04-21T10:05:07-07:00</committed-date>
    <authored-date>2009-02-15T18:44:48-08:00</authored-date>
    <message>Add microsecond support for sqlite adapter [#1982 state:resolved]

Signed-off-by: Pratik Naik &lt;pratiknaik@gmail.com&gt;</message>
    <tree>54dbc2d8103757b653ac3fafc3eaa6773b58acc2</tree>
    <committer>
      <name>Pratik Naik</name>
      <email>pratiknaik@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>d7d93cdb628e12e84e70a68578af1b1338a7df98</id>
      </parent>
    </parents>
    <author>
      <name>Stephen Celis</name>
      <email>stephen@stephencelis.com</email>
    </author>
    <url>http://github.com/technoweenie/rails/commit/7a99dc0ac2f36694b1cc11418129b8c39bb9044d</url>
    <id>7a99dc0ac2f36694b1cc11418129b8c39bb9044d</id>
    <committed-date>2009-04-21T09:44:35-07:00</committed-date>
    <authored-date>2009-04-20T09:01:32-07:00</authored-date>
    <message>Update rails:template task to expand file paths [#2528 state:resolved]

Signed-off-by: Pratik Naik &lt;pratiknaik@gmail.com&gt;</message>
    <tree>69df7a4f377d52c9e1ae7d1c87b940e5dccd51b6</tree>
    <committer>
      <name>Pratik Naik</name>
      <email>pratiknaik@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>398b07e655b6f643f31fb47b3cf7bc2dba009dc7</id>
      </parent>
    </parents>
    <author>
      <name>Pratik Naik</name>
      <email>pratiknaik@gmail.com</email>
    </author>
    <url>http://github.com/technoweenie/rails/commit/d7d93cdb628e12e84e70a68578af1b1338a7df98</url>
    <id>d7d93cdb628e12e84e70a68578af1b1338a7df98</id>
    <committed-date>2009-04-21T09:31:26-07:00</committed-date>
    <authored-date>2009-04-21T09:31:07-07:00</authored-date>
    <message>Fix nginx config in ci setup notes [Chad Woolley] [#2290 state:resolved]</message>
    <tree>4880347e3c7f835a57e9a45bd36bd955b4fdeb7c</tree>
    <committer>
      <name>Pratik Naik</name>
      <email>pratiknaik@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>2e6d1bf43e162026307141806e04b4d62e40a2f8</id>
      </parent>
    </parents>
    <author>
      <name>Mike Gunderloy</name>
      <email>MikeG1@larkfarm.com</email>
    </author>
    <url>http://github.com/technoweenie/rails/commit/398b07e655b6f643f31fb47b3cf7bc2dba009dc7</url>
    <id>398b07e655b6f643f31fb47b3cf7bc2dba009dc7</id>
    <committed-date>2009-04-21T06:32:52-07:00</committed-date>
    <authored-date>2009-04-21T06:32:52-07:00</authored-date>
    <message>Remove excess mocking from polymorphic_url tests [#2330 state:resolved]

Signed-off-by: Pratik Naik &lt;pratiknaik@gmail.com&gt;</message>
    <tree>d101489056ea639cfce19cb935b0dd166cb718b5</tree>
    <committer>
      <name>Pratik Naik</name>
      <email>pratiknaik@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>2381f6f3dc311f18164aeb4a253ced0feaeef8a9</id>
      </parent>
    </parents>
    <author>
      <name>Pratik Naik</name>
      <email>pratiknaik@gmail.com</email>
    </author>
    <url>http://github.com/technoweenie/rails/commit/2e6d1bf43e162026307141806e04b4d62e40a2f8</url>
    <id>2e6d1bf43e162026307141806e04b4d62e40a2f8</id>
    <committed-date>2009-04-21T05:28:49-07:00</committed-date>
    <authored-date>2009-04-21T05:28:49-07:00</authored-date>
    <message>Change table to prevent copying indexes on sqlite2</message>
    <tree>229b36b4e5c05c0d355b3b88afb8f1123a44508a</tree>
    <committer>
      <name>Pratik Naik</name>
      <email>pratiknaik@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>6513dde490ac35aa6974d85377ecc9af4d2e20fd</id>
      </parent>
    </parents>
    <author>
      <name>Pratik Naik</name>
      <email>pratiknaik@gmail.com</email>
    </author>
    <url>http://github.com/technoweenie/rails/commit/2381f6f3dc311f18164aeb4a253ced0feaeef8a9</url>
    <id>2381f6f3dc311f18164aeb4a253ced0feaeef8a9</id>
    <committed-date>2009-04-21T05:11:56-07:00</committed-date>
    <authored-date>2009-04-21T05:11:56-07:00</authored-date>
    <message>Specify :group with the table name for it to work on sqlite3</message>
    <tree>16e1b7f5c81df511f5f78ac383df8522a360953d</tree>
    <committer>
      <name>Pratik Naik</name>
      <email>pratiknaik@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>f3ac4f387dd748db349ec217030d2b13260516f1</id>
      </parent>
    </parents>
    <author>
      <name>Pratik Naik</name>
      <email>pratiknaik@gmail.com</email>
    </author>
    <url>http://github.com/technoweenie/rails/commit/6513dde490ac35aa6974d85377ecc9af4d2e20fd</url>
    <id>6513dde490ac35aa6974d85377ecc9af4d2e20fd</id>
    <committed-date>2009-04-21T05:06:26-07:00</committed-date>
    <authored-date>2009-04-21T05:06:26-07:00</authored-date>
    <message>Fix tests for sqlite3 3.6.xx</message>
    <tree>5ed0b64e568b7915e3cf2cfc8266fe4da5457639</tree>
    <committer>
      <name>Pratik Naik</name>
      <email>pratiknaik@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>64b33b6cf9db508d2c12394cc1a3f36c91fb2eed</id>
      </parent>
    </parents>
    <author>
      <name>Max Lapshin</name>
      <email>max@maxidoors.ru</email>
    </author>
    <url>http://github.com/technoweenie/rails/commit/f3ac4f387dd748db349ec217030d2b13260516f1</url>
    <id>f3ac4f387dd748db349ec217030d2b13260516f1</id>
    <committed-date>2009-04-21T03:44:13-07:00</committed-date>
    <authored-date>2009-04-20T08:47:31-07:00</authored-date>
    <message>Fixed dumping from postgresql columns in index in wrong order. [#2515 state:resolved]

Signed-off-by: Tarmo T&#228;nav &lt;tarmo@itech.ee&gt;</message>
    <tree>9f7bebcd267c68ff929f516700e91149552daab9</tree>
    <committer>
      <name>Pratik Naik</name>
      <email>pratiknaik@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>cdcd638c2f27ebf98ba7aa59512547f58a5e0c61</id>
      </parent>
    </parents>
    <author>
      <name>Scott Woods</name>
      <email>scott@westarete.com</email>
    </author>
    <url>http://github.com/technoweenie/rails/commit/64b33b6cf9db508d2c12394cc1a3f36c91fb2eed</url>
    <id>64b33b6cf9db508d2c12394cc1a3f36c91fb2eed</id>
    <committed-date>2009-04-21T03:43:38-07:00</committed-date>
    <authored-date>2009-04-20T13:48:02-07:00</authored-date>
    <message>Quote table names when casting to regclass so that capitalized tables are supported. [#2418 state:resolved]

Signed-off-by: Tarmo T&#228;nav &lt;tarmo@itech.ee&gt;</message>
    <tree>4ee0d64fba52ffe0c7ddec4a5fd88adf70561767</tree>
    <committer>
      <name>Pratik Naik</name>
      <email>pratiknaik@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>b10fb7e7bcb5efea6c93ae52bad125887cfc235c</id>
      </parent>
    </parents>
    <author>
      <name>Max Lapshin</name>
      <email>max@maxidoors.ru</email>
    </author>
    <url>http://github.com/technoweenie/rails/commit/cdcd638c2f27ebf98ba7aa59512547f58a5e0c61</url>
    <id>cdcd638c2f27ebf98ba7aa59512547f58a5e0c61</id>
    <committed-date>2009-04-21T03:42:40-07:00</committed-date>
    <authored-date>2009-04-20T09:08:51-07:00</authored-date>
    <message>Fixed wrong quoting of index names in postgres [#2402 state:resolved]

Signed-off-by: Tarmo T&#228;nav &lt;tarmo@itech.ee&gt;</message>
    <tree>6673b667fd9daa818962d969724adc6a5306741d</tree>
    <committer>
      <name>Pratik Naik</name>
      <email>pratiknaik@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>685a53a360d0d8fc4a9f3b49f900621c940a71f2</id>
      </parent>
      <parent>
        <id>b10fb7e7bcb5efea6c93ae52bad125887cfc235c</id>
      </parent>
    </parents>
    <author>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </author>
    <url>http://github.com/technoweenie/rails/commit/696375ac628bd41edf3a8c8c00dde196696f4add</url>
    <id>696375ac628bd41edf3a8c8c00dde196696f4add</id>
    <committed-date>2009-04-20T20:06:30-07:00</committed-date>
    <authored-date>2009-04-20T20:06:30-07:00</authored-date>
    <message>Merge branch 'master' into cherry</message>
    <tree>0b8ca850e462d5d2722ea4d2217d9c132a0e3cb1</tree>
    <committer>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>164a94d0bc8c9124ab820506e5ad79496395c026</id>
      </parent>
      <parent>
        <id>de0ea3866370ec61581f910cf393a3cc97eba32f</id>
      </parent>
    </parents>
    <author>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </author>
    <url>http://github.com/technoweenie/rails/commit/b10fb7e7bcb5efea6c93ae52bad125887cfc235c</url>
    <id>b10fb7e7bcb5efea6c93ae52bad125887cfc235c</id>
    <committed-date>2009-04-20T18:34:43-07:00</committed-date>
    <authored-date>2009-04-20T18:34:43-07:00</authored-date>
    <message>Merge branch 'master' of git@github.com:rails/rails</message>
    <tree>bda34b186b63ac607e7387df935e4d67f3b5123b</tree>
    <committer>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>db05c73fb6e2294c576ef9889c70940891682c32</id>
      </parent>
      <parent>
        <id>164a94d0bc8c9124ab820506e5ad79496395c026</id>
      </parent>
    </parents>
    <author>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </author>
    <url>http://github.com/technoweenie/rails/commit/685a53a360d0d8fc4a9f3b49f900621c940a71f2</url>
    <id>685a53a360d0d8fc4a9f3b49f900621c940a71f2</id>
    <committed-date>2009-04-20T18:31:40-07:00</committed-date>
    <authored-date>2009-04-20T18:31:22-07:00</authored-date>
    <message>Merge branch 'master' into cherry

Conflicts:
	activesupport/CHANGELOG
	activesupport/lib/active_support/core_ext/class/delegating_attributes.rb
	activesupport/lib/active_support/core_ext/hash/conversions.rb
	activesupport/lib/active_support/core_ext/module/attribute_accessors.rb
	activesupport/lib/active_support/core_ext/string/multibyte.rb
	activesupport/lib/active_support/core_ext/time/calculations.rb
	activesupport/lib/active_support/deprecation.rb</message>
    <tree>fa6b38f75a873a21c3e380f1acbab3d019293363</tree>
    <committer>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>4f63e848433f16652f3776e814316ce1891bd0ff</id>
      </parent>
    </parents>
    <author>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </author>
    <url>http://github.com/technoweenie/rails/commit/db05c73fb6e2294c576ef9889c70940891682c32</url>
    <id>db05c73fb6e2294c576ef9889c70940891682c32</id>
    <committed-date>2009-04-20T18:14:39-07:00</committed-date>
    <authored-date>2009-04-20T18:14:39-07:00</authored-date>
    <message>Move AS::Duration autoload to core/time/autoload</message>
    <tree>7b08643dd887d344fad99dd2a0b4d3aa953826bd</tree>
    <committer>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>489abfd3b23f3c4b3de86aeb3bde3970771c001b</id>
      </parent>
    </parents>
    <author>
      <name>Pratik Naik</name>
      <email>pratiknaik@gmail.com</email>
    </author>
    <url>http://github.com/technoweenie/rails/commit/de0ea3866370ec61581f910cf393a3cc97eba32f</url>
    <id>de0ea3866370ec61581f910cf393a3cc97eba32f</id>
    <committed-date>2009-04-20T10:12:40-07:00</committed-date>
    <authored-date>2009-04-20T10:12:40-07:00</authored-date>
    <message>Ensure :dependent =&gt; :delete_all works for association with hash conditions</message>
    <tree>b32efb2bea337b96c875ac5e78c39760c5e663bf</tree>
    <committer>
      <name>Pratik Naik</name>
      <email>pratiknaik@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>7ce0778a1516110cf8015e59e2e8fac15032379c</id>
      </parent>
    </parents>
    <author>
      <name>Pratik Naik</name>
      <email>pratiknaik@gmail.com</email>
    </author>
    <url>http://github.com/technoweenie/rails/commit/489abfd3b23f3c4b3de86aeb3bde3970771c001b</url>
    <id>489abfd3b23f3c4b3de86aeb3bde3970771c001b</id>
    <committed-date>2009-04-20T05:51:11-07:00</committed-date>
    <authored-date>2009-04-20T05:51:11-07:00</authored-date>
    <message>Ensure JoinAssociation uses aliased table name when multiple associations have hash conditions on the same table</message>
    <tree>49eb51b0702d088302cf592b99c391528246fc96</tree>
    <committer>
      <name>Pratik Naik</name>
      <email>pratiknaik@gmail.com</email>
    </committer>
  </commit>
</commits>
