From ee713ad03668655799c7d0c564e2f5c74a70e2d1 Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Mon, 21 Jan 2013 09:04:01 +0100
Subject: [PATCH 1/2] add Brian Okken's blog post as a tutorial

---
 doc/en/conf.py   | 2 +-
 doc/en/talks.txt | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/doc/en/conf.py b/doc/en/conf.py
index b15711d65..b5129740f 100644
--- a/doc/en/conf.py
+++ b/doc/en/conf.py
@@ -17,7 +17,7 @@
 #
 # The full version, including alpha/beta/rc tags.
 # The short X.Y version.
-version = release = "2.3.4"
+version = release = "2.3.4.1"
 
 import sys, os
 
diff --git a/doc/en/talks.txt b/doc/en/talks.txt
index 86f6bfa4c..4d562c30f 100644
--- a/doc/en/talks.txt
+++ b/doc/en/talks.txt
@@ -12,6 +12,9 @@ Tutorial examples and blog postings
 
 Basic usage and funcargs:
 
+- `pytest introduction from Brian Okken (January 2013)
+  <http://pythontesting.net/framework/pytest-introduction/>`_
+
 - `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>`_ 
@@ -57,7 +60,7 @@ Plugin specific examples:
 .. _`generating parametrized tests with funcargs`: funcargs.html#test-generators
 .. _`test generators and cached setup`: http://bruynooghe.blogspot.com/2010/06/pytest-test-generators-and-cached-setup.html
 
-Conference talks and tutorials
+Older conference talks and tutorials
 ----------------------------------------
 
 - `ep2009-rapidtesting.pdf`_ tutorial slides (July 2009):

From c5f587d6db92f7062786e980acb4798253c1225f Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Sat, 26 Jan 2013 14:49:33 +0100
Subject: [PATCH 2/2] don't test on py24 for now because tox/virtualenv-1.8
 does not support python2.4

---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 11df1bdc5..bcb8146f2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 distshare={homedir}/.tox/distshare
-envlist=py24,py26,py27,py27-nobyte,py31,py32,py33,py27-xdist,py25,trial
+envlist=py25,py26,py27,py27-nobyte,py31,py32,py33,py27-xdist,trial
 indexserver=
     pypi = http://pypi.python.org/simple
     testrun = http://pypi.testrun.org