<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -1,5 +1,23 @@
 = 1.0 / unreleased
 
+ * Sinatra now uses Tilt &lt;http://github.com/rtomayko/tilt&gt; for rendering
+   templates. This adds support for template caching, consistent
+   template backtraces, and support for new template engines, like
+   markaby and liquid.
+
+ * New 'expires' helper method is like cache_control but takes an
+   integer number of seconds or Time object:
+       expires 300, :public, :must_revalidate
+
+ * New 'cache_control' helper method provides a convenient way of
+   setting the Cache-Control response header. Takes a variable number
+   of boolean directives followed by a hash of value directives, like
+   this:
+       cache_control :public, :must_revalidate, :max_age =&gt; 60
+
+ * Rack::Session::Cookie is now added to the middleware pipeline when
+   running in test environments if the :sessions option is set.
+
  * Route handlers, before filters, templates, error mappings, and
    middleware are now resolved dynamically up the inheritance hierarchy
    when needed instead of duplicating the superclass's version when</diff>
      <filename>CHANGES</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>77aa857c71651e599056777cab073b26dfc83f5c</id>
    </parent>
  </parents>
  <author>
    <name>Ryan Tomayko</name>
    <email>rtomayko@gmail.com</email>
  </author>
  <url>http://github.com/rtomayko/sinatra/commit/e3a9f9e3b816fddbe7f7705e3ac9a0fd1507a8ab</url>
  <id>e3a9f9e3b816fddbe7f7705e3ac9a0fd1507a8ab</id>
  <committed-date>2009-10-11T21:39:55-07:00</committed-date>
  <authored-date>2009-10-11T21:39:55-07:00</authored-date>
  <message>update CHANGES file with recent changes</message>
  <tree>b5f513f2d81b8c40cb554c866d8f649122def539</tree>
  <committer>
    <name>Ryan Tomayko</name>
    <email>rtomayko@gmail.com</email>
  </committer>
</commit>
