From 09c46a3b83cb2dfbd03d40e264d5f5f8f7a6eaf7 Mon Sep 17 00:00:00 2001
From: Dan Rice <drice@diego>
Date: Tue, 5 Feb 2013 00:44:01 -0500
Subject: [PATCH] Bring in recent entries from the 2.1_branch changelog

Also restore header formatting to before it was pasted from the README
---
 doc/CHANGELOG | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 48292dbb..22ddeb59 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -1,6 +1,4 @@
-# Tracks: a GTD(TM) web application, built with Ruby on Rails
-
-[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/TracksApp/tracks)
+= Tracks: a GTD(TM) web application, built with Ruby on Rails
 
 * Project homepage: http://getontracks.org/
 * Manual: http://getontracks.org/manual/
@@ -58,6 +56,14 @@ Under the hood
 * Migrated to Tolk for managing translations
 * Upgraded to JQuery 1.8.3 and JQueryUI 1.9.0
 
+== Version 2.1.3
+
+Upgrade Rails to 2.3.16 to address security vulnerabilities in Rails
+
+== Version 2.1.2
+
+Upgrade Rails to 2.3.15 to address security vulnerabilities in Rails
+
 == Version 2.1.1
 
 Various bugfixes