From ea814bea7b226206f59da70491f37dfcec05b319 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Fri, 2 Dec 2011 15:12:40 -0500
Subject: garden

---
 CHANGES.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index c1a4f0216..8bdb35d6e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -48,6 +48,9 @@ Bug Fixes
   argument which contains characters that are unsuitable for URLs.  See
   https://github.com/Pylons/pyramid/issues/349 for more info.
 
+- Prevent a scaffold rendering from being named ``site`` (conflicts with
+  Python internal site.py).
+
 Backwards Incompatibilities
 ---------------------------
 
-- 
cgit v1.2.3