From 8fabdf8b72af2ced5893643e30371e9517ef6a76 Mon Sep 17 00:00:00 2001
From: Lance Edgar <ledgar@sacfoodcoop.com>
Date: Mon, 28 Apr 2014 14:27:32 -0700
Subject: [PATCH] update changelog

---
 CHANGES.txt       | 6 ++++++
 edbob/_version.py | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 688705d..8bfbfbc 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,10 @@
 
+0.1.2
+-----
+
+* Allow config file to prevent logging configuration from happening.
+
+
 0.1.1
 -----
 
diff --git a/edbob/_version.py b/edbob/_version.py
index df9144c..10939f0 100644
--- a/edbob/_version.py
+++ b/edbob/_version.py
@@ -1 +1 @@
-__version__ = '0.1.1'
+__version__ = '0.1.2'