From 901f764825840241e9d48730d06598418d25060c Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Sat, 14 Dec 2013 14:00:47 +0100
Subject: [PATCH] merge

---
 _pytest/python.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/_pytest/python.py b/_pytest/python.py
index b437871a7..e6a99c7b9 100644
--- a/_pytest/python.py
+++ b/_pytest/python.py
@@ -1616,6 +1616,7 @@ class FixtureManager:
         return fixturenames_closure, arg2fixturedefs
 
     def pytest_generate_tests(self, metafunc):
+        print "pytest core pytest_generate_tests"
         for argname in metafunc.fixturenames:
             faclist = metafunc._arg2fixturedefs.get(argname)
             if faclist is None: