<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -12,6 +12,12 @@
 
 * Make sure TMail#attachments includes anything with content-disposition of &quot;attachment&quot;, regardless of content-type [Jamis Buck]
 
+*1.1.5* (December 13th, 2005)
+
+* Become part of Rails 1.0
+
+*1.1.4* (December 7th, 2005)
+
 * Rename Version constant to VERSION. #2802 [Marcel Molina Jr.]
 
 * Stricter matching for implicitly multipart filenames excludes files ending in unsupported extensions (such as foo.rhtml.bak) and without a two-part content type (such as foo.text.rhtml or foo.text.really.plain.rhtml).  #2398 [Dave Burt &lt;dave@burt.id.au&gt;, Jeremy Kemper]</diff>
      <filename>actionmailer/CHANGELOG</filename>
    </modified>
    <modified>
      <diff>@@ -320,6 +320,10 @@ Default YAML web services were retired, ActionController::Base.param_parsers car
 
 * Don't include a layout when rendering an rjs template using render's :template option. [Marcel Molina Jr.]
 
+*1.1.2* (December 13th, 2005)
+
+* Become part of Rails 1.0
+
 * Update to script.aculo.us 1.5.0 final (equals 1.5.0_rc6) [Thomas Fuchs]
 
 * Update to Prototype 1.4.0 final [Sam Stephenson]</diff>
      <filename>actionpack/CHANGELOG</filename>
    </modified>
    <modified>
      <diff>@@ -24,6 +24,12 @@
 
 * Fix for incompatibility problems with SOAP4R 1.5.5 (#2553) [Kent Sibilev]
 
+*1.0.0* (December 13th, 2005)
+
+* Become part of Rails 1.0
+
+*0.9.4* (December 7th, 2005)
+
 * Update from LGPL to MIT license as per Minero Aoki's permission. [Marcel Molina Jr.]
 
 * Rename Version constant to VERSION. #2802 [Marcel Molina Jr.]</diff>
      <filename>actionwebservice/CHANGELOG</filename>
    </modified>
    <modified>
      <diff>@@ -418,6 +418,10 @@
 
 * Fixed :through relations when using STI inherited classes would use the inherited class's name as foreign key on the join model [Tobias Luetke] 
 
+*1.13.2* (December 13th, 2005)
+
+* Become part of Rails 1.0
+
 * MySQL: allow encoding option for mysql.rb driver.  [Jeremy Kemper]
 
 * Added option inheritance for find calls on has_and_belongs_to_many and has_many assosociations [DHH]. Example:</diff>
      <filename>activerecord/CHANGELOG</filename>
    </modified>
    <modified>
      <diff>@@ -161,6 +161,10 @@ approximations and shouldn't be used for critical calculations. [Koz]
   * Object#extended_by to get an instance's included/extended modules
   * Object#extend_with_included_modules_from(object) to extend an instance with the modules from another instance
 
+*1.2.5* (December 13th, 2005)
+
+* Become part of Rails 1.0
+
 * Rename Version constant to VERSION. #2802 [Marcel Molina Jr.]
 
 *1.2.3* (November 7th, 2005)</diff>
      <filename>activesupport/CHANGELOG</filename>
    </modified>
    <modified>
      <diff>@@ -139,6 +139,8 @@
 
 * Honor ActiveRecord::Base.pluralize_table_names when creating and destroying session store table. #3204. [rails@bencurtis.com, Marcel Molina Jr.]
 
+*1.0.0* (December 13th, 2005)
+
 * Update instructions on how to find and install generators. #3172. [Chad Fowler]
 
 * Generator looks in vendor/generators also.  [Chad Fowler]</diff>
      <filename>railties/CHANGELOG</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>2597bd6970c394445e7256c1fb9058538422665b</id>
    </parent>
  </parents>
  <author>
    <name>Marcel Molina</name>
    <email>marcel@vernix.org</email>
  </author>
  <url>http://github.com/chriseppstein/rails/commit/4e3c101bcbed0ed9f3dec687023eadac3d9c51b8</url>
  <id>4e3c101bcbed0ed9f3dec687023eadac3d9c51b8</id>
  <committed-date>2006-03-27T20:05:08-08:00</committed-date>
  <authored-date>2006-03-27T20:05:08-08:00</authored-date>
  <message>Add 1.0 marker to edge rails changelongs

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4085 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
  <tree>dd9dceb7e4a063d943046542acd41101f3081ff5</tree>
  <committer>
    <name>Marcel Molina</name>
    <email>marcel@vernix.org</email>
  </committer>
</commit>
