From 50abe43216bd6f18250ea8c51491383c380e972e Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Fri, 14 Mar 2014 15:44:39 +0100
Subject: [PATCH] fix issue #479: properly handle nose/unittest(2) SkipTest
 exceptions during collection/loading of test modules.  Thanks to Marc
 Schlaich for the complete PR.

---
 AUTHORS   | 1 +
 CHANGELOG | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index bce4c6bc5..cd3082ee5 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -38,3 +38,4 @@ Anthon van der Neut
 Mark Abramowitz
 Piotr Banaszkiewicz
 Jurko Gospodnetić
+Marc Schlaich
diff --git a/CHANGELOG b/CHANGELOG
index fd84627c8..0c65f1ae4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -11,6 +11,11 @@ NEXT (2.6)
 - change skips into warnings for test classes with an __init__ and
   callables in test modules which look like a test but are not functions.
 
+- fix issue #479: properly handle nose/unittest(2) SkipTest exceptions
+  during collection/loading of test modules.  Thanks to Marc Schlaich
+  for the complete PR.
+
+
 2.5.2
 -----------------------------------