From dd56d7b7fca7cba45bc22fb4ff30a5a0a31c99ac Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <nicoddemus@gmail.com>
Date: Wed, 20 Jan 2016 19:00:52 -0200
Subject: [PATCH] Add CHANGELOG and AUTHORS entry for #1334

---
 AUTHORS   | 1 +
 CHANGELOG | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index 625e8535a..7b22002d1 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -35,6 +35,7 @@ Erik M. Bray
 Florian Bruhin
 Floris Bruynooghe
 Gabriel Reis
+Georgy Dyuldin
 Graham Horler
 Grig Gheorghiu
 Guido Wesdorp
diff --git a/CHANGELOG b/CHANGELOG
index 6e3a73a49..3dd62dd22 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -26,6 +26,9 @@
 - fix #628: fixed internal UnicodeDecodeError when doctests contain unicode.
   Thanks Jason R. Coombs for the report and Bruno Oliveira for the PR.
 
+- fix #1334: Add captured stdout to jUnit XML report on setup error.
+  Thanks Georgy Dyuldin for the PR.
+
 
 2.8.5
 -----