From d54b1066219cd4fca5ccaa8fc39f9c83ef355d31 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Sat, 3 Sep 2011 23:14:53 -0400
Subject: another credit

---
 pyramid/config/__init__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pyramid/config/__init__.py b/pyramid/config/__init__.py
index 89802513f..8ee0bfac4 100644
--- a/pyramid/config/__init__.py
+++ b/pyramid/config/__init__.py
@@ -1025,6 +1025,7 @@ def resolveConflicts(actions):
 
     return r
 
+# this function is licensed under the ZPL (stolen from Zope)
 def expand_action(discriminator, callable=None, args=(), kw=None,
                    includepath=(), info='', order=0):
     if kw is None:
-- 
cgit v1.2.3