From 732453eedc15fc7dc9fd799aa8bd6944fa167978 Mon Sep 17 00:00:00 2001
From: Lance Edgar <ledgar@sacfoodcoop.com>
Date: Wed, 2 Nov 2016 15:06:34 -0500
Subject: [PATCH] Update changelog

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

diff --git a/CHANGES.rst b/CHANGES.rst
index 61119975..d7addc35 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,6 +2,12 @@
 CHANGELOG
 =========
 
+0.5.34 (2016-11-02)
+-------------------
+
+* Add basic merge feature to ``MasterView``
+
+
 0.5.33 (2016-10-27)
 -------------------
 
diff --git a/tailbone/_version.py b/tailbone/_version.py
index 2d7e9126..47a1fb89 100644
--- a/tailbone/_version.py
+++ b/tailbone/_version.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-__version__ = u'0.5.33'
+__version__ = u'0.5.34'