From 675669c52ebdd48ec14a6543469b642f6d4bdc69 Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Sat, 18 Jan 2014 14:53:04 +0100
Subject: [PATCH] added changelog: fixed docs and code to use "pytest" instead
 of "py.test" everywhere.  Thanks Jurko Gspodnetic for the complete PR.

---
 CHANGELOG | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index f31fbe909..1466642e8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,9 @@ UNRELEASED
   trying to import from collections.abc which causes problems for py27/cx_freeze.
   Thanks Wolfgang L. for reporting and tracking it down.
 
+- fixed docs and code to use "pytest" instead of "py.test" everywhere.
+  Thanks Jurko Gspodnetic for the complete PR.
+
 2.5.1
 -----------------------------------