<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -6,4 +6,4 @@
 // +---------------------------------------------------------------------------------------------------+ //
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-1.2.0.7962
\ No newline at end of file
+1.2.1.8004
\ No newline at end of file</diff>
      <filename>VERSION.txt</filename>
    </modified>
    <modified>
      <diff>@@ -22,5 +22,5 @@
  * @lastmodified  $Date$
  * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
  */
-return $config['Cake.version'] = '1.2.0.7962';
+return $config['Cake.version'] = '1.2.1.8004';
 ?&gt;
\ No newline at end of file</diff>
      <filename>config/config.php</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>e450eef70e2c5e3954e37e3b0b0ee00871a45313</id>
    </parent>
  </parents>
  <author>
    <name>gwoo</name>
    <email>gwoo@3807eeeb-6ff5-0310-8944-8be069107fe0</email>
  </author>
  <url>http://github.com/joelmoss/cakephp/commit/12bd44536698ce8b5f995f2f2c3e6ad0fe1aa8ba</url>
  <id>12bd44536698ce8b5f995f2f2c3e6ad0fe1aa8ba</id>
  <committed-date>2009-01-16T12:15:21-08:00</committed-date>
  <authored-date>2009-01-16T12:15:21-08:00</authored-date>
  <message>merging fixes to trunk

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x/cake@8004 3807eeeb-6ff5-0310-8944-8be069107fe0</message>
  <tree>d3a7d3748404a4fcb60124573b5af0e3e1e19150</tree>
  <committer>
    <name>gwoo</name>
    <email>gwoo@3807eeeb-6ff5-0310-8944-8be069107fe0</email>
  </committer>
</commit>
