From 49741dc272d259fb098f72aaa852983f0a9354a2 Mon Sep 17 00:00:00 2001
From: Jannis Leidel <jannis@leidel.info>
Date: Fri, 3 Aug 2012 18:29:45 +0200
Subject: [PATCH] Updated changelog and bumped version.

---
 compressor/__init__.py | 2 +-
 docs/changelog.txt     | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/compressor/__init__.py b/compressor/__init__.py
index 44c8316..8797d61 100644
--- a/compressor/__init__.py
+++ b/compressor/__init__.py
@@ -1,2 +1,2 @@
 # following PEP 386
-__version__ = "1.2a2"
+__version__ = "1.2"
diff --git a/docs/changelog.txt b/docs/changelog.txt
index 49ac318..c25d70a 100644
--- a/docs/changelog.txt
+++ b/docs/changelog.txt
@@ -1,8 +1,8 @@
 Changelog
 =========
 
-v1.2 (in development)
----------------------
+v1.2 (in 08/03/2012)
+--------------------
 
 - Added compatibility with Django 1.4 and dropped support for Django 1.2.X.
 
@@ -60,6 +60,8 @@ v1.2 (in development)
 - Added a new hook to allow developers to completely bypass offline
   compression in CompressorNode subclasses: ``is_offline_compression_enabled``.
 
+- Dropped versiontools from required dependencies again.
+
 v1.1.2
 ------