From 4e2a820c6a232ed884a205a69d71d1c9d5d0d8ee Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Thu, 23 Jan 2014 13:07:28 +0100
Subject: [PATCH] add Daniel Greensfeld 3-part blog series about pytest

---
 doc/en/talks.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/en/talks.txt b/doc/en/talks.txt
index 58470141b..75b6e4cfa 100644
--- a/doc/en/talks.txt
+++ b/doc/en/talks.txt
@@ -18,6 +18,9 @@ Basic usage and fixtures:
 - `pytest introduction from Brian Okken (January 2013)
   <http://pythontesting.net/framework/pytest-introduction/>`_
 
+- `3-part blog series about pytest from Daniel Greenfeld (January
+  2014) <http://pydanny.com/pytest-no-boilerplate-testing.html>`_
+
 - `pycon australia 2012 pytest talk from Brianna Laugher
   <http://2012.pycon-au.org/schedule/52/view_talk?day=sunday>`_ (`video <http://www.youtube.com/watch?v=DTNejE9EraI>`_, `slides <http://www.slideshare.net/pfctdayelise/funcargs-other-fun-with-pytest>`_, `code <https://gist.github.com/3386951>`_)
 - `pycon 2012 US talk video from Holger Krekel <http://www.youtube.com/watch?v=9LVqBQcFmyw>`_