From 9059e9538a449f0fc36ad4b43cadc6bd8a2f1e0e Mon Sep 17 00:00:00 2001
From: Doug Hellmann <doug.hellmann@dreamhost.com>
Date: Wed, 30 May 2012 18:51:02 -0400
Subject: add attribution to history for the previous merge

Change-Id: I655e549ab28cd40114f2f9eb2e09d0698ab70b3d
---
 docs/source/history.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/source/history.rst b/docs/source/history.rst
index bbfb799..10b8294 100644
--- a/docs/source/history.rst
+++ b/docs/source/history.rst
@@ -2,6 +2,11 @@
  Release History
 =================
 
+dev
+
+  - Add trailing newlines after output from tablib-based formatters
+    (JSON, YAML, and HTML). Contributed by Matt Joyce.
+
 0.7
 
   - Clean up interactive mode flag settting.
-- 
cgit v1.2.1