From 6e6a6aad565ab68904f49a50bfbc41c1fff36698 Mon Sep 17 00:00:00 2001
From: medmunds <medmunds@gmail.com>
Date: Mon, 29 Sep 2014 17:06:07 -0700
Subject: [PATCH] Prep for 1.2 release

[ci skip]
---
 docs/history.rst | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/history.rst b/docs/history.rst
index afdc56f..9177571 100644
--- a/docs/history.rst
+++ b/docs/history.rst
@@ -1,7 +1,10 @@
 Release Notes
 =============
 
-Version 1.2 (development):
+Version 1.2:
+
+* Support Django 1.7; add testing on Python 3.3, 3.4, and PyPy
+* Bug fixes
 
 
 Version 1.1: