From f07ebc66159a0f184146e11dfb47db1fe3e66a6d Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Sun, 26 Aug 2012 16:30:01 +0200
Subject: [PATCH] add talk from brianna and me from 2012

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

diff --git a/doc/en/talks.txt b/doc/en/talks.txt
index e458a3409..572102c69 100644
--- a/doc/en/talks.txt
+++ b/doc/en/talks.txt
@@ -12,8 +12,12 @@ Tutorial examples and blog postings
 
 Basic usage and funcargs:
 
+- `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>`_ 
 - `pycon 2010 tutorial PDF`_ and `tutorial1 repository`_
 
+
 Function arguments:
 
 - :ref:`mysetup`