From f7f1e4dfe6649bbfc73b8021eb44074b02c5f0c2 Mon Sep 17 00:00:00 2001
From: Emanuel Borsboom <manny@fpcomplete.com>
Date: Mon, 22 Aug 2016 16:08:25 -0700
Subject: [PATCH] stack.cabal: bump version to 1.2.1

---
 ChangeLog.md | 12 ++++++++++++
 stack.cabal  |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index c8a1703272..3f01dec9f5 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,5 +1,17 @@
 # Changelog
 
+## Unreleased changes
+
+Release notes:
+
+Major changes:
+
+Behavior changes:
+
+Other enhancements:
+
+Bug fixes:
+
 ## 1.2.0
 
 Release notes:
diff --git a/stack.cabal b/stack.cabal
index 724b673014..99158cdda6 100644
--- a/stack.cabal
+++ b/stack.cabal
@@ -1,5 +1,5 @@
 name:                stack
-version:             1.2.0
+version:             1.2.1
 synopsis:            The Haskell Tool Stack
 description:         Please see the README.md for usage information, and
                      the wiki on Github for more details.  Also, note that