From e2ec94f197f7e2a040091d661cc56496e6136eba Mon Sep 17 00:00:00 2001
From: goodwillcoding <goodwillcoding@webhippo.net>
Date: Sun, 1 Jun 2014 19:31:20 -0700
Subject: fix inclusion of README.rst in the package description

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index c832d3fc8..d736dc38d 100644
--- a/setup.py
+++ b/setup.py
@@ -30,7 +30,7 @@ else:
 
 here = os.path.abspath(os.path.dirname(__file__))
 try:
-    with open(os.path.join(here, 'README.txt')) as f:
+    with open(os.path.join(here, 'README.rst')) as f:
         README = f.read()
     with open(os.path.join(here, 'CHANGES.txt')) as f:
         CHANGES = f.read()
-- 
cgit v1.2.3


From a207c7b32e47d69dd6249a4a2f2f273cd3632264 Mon Sep 17 00:00:00 2001
From: george2 <george2@users.noreply.github.com>
Date: Wed, 4 Jun 2014 16:03:04 -0600
Subject: Scaffold template: close an ul tag.

Missing `</ul>` in starter scaffold template.
---
 pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl b/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl
index 738a16817..87fae3817 100644
--- a/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl
+++ b/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl
@@ -46,6 +46,7 @@
               <li><i class="glyphicon glyphicon-cog icon-muted"></i><a href="https://github.com/Pylons/pyramid">Github Project</a></li>
               <li><i class="glyphicon glyphicon-globe icon-muted"></i><a href="irc://irc.freenode.net#pyramid">IRC Channel</a></li>
               <li><i class="glyphicon glyphicon-home icon-muted"></i><a href="http://pylonsproject.org">Pylons Project</a></li>
+            </ul>
           </div>
         </div>
         <div class="row">
-- 
cgit v1.2.3


From 18ca2efc3130642d359f47b97f50046f8b045e7c Mon Sep 17 00:00:00 2001
From: george <rpubaddr0@gmail.com>
Date: Wed, 4 Jun 2014 16:07:58 -0600
Subject: Scaffold templates: close more ul tags.

Missing  tags in other scaffold templates.
---
 pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl | 1 +
 pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl b/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl
index 73d0976b9..3f1d23d47 100644
--- a/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl
+++ b/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl
@@ -46,6 +46,7 @@
               <li><i class="glyphicon glyphicon-cog icon-muted"></i><a href="https://github.com/Pylons/pyramid">Github Project</a></li>
               <li><i class="glyphicon glyphicon-globe icon-muted"></i><a href="irc://irc.freenode.net#pyramid">IRC Channel</a></li>
               <li><i class="glyphicon glyphicon-home icon-muted"></i><a href="http://pylonsproject.org">Pylons Project</a></li>
+            </ul>
           </div>
         </div>
         <div class="row">
diff --git a/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl b/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl
index 855944899..e109ab829 100644
--- a/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl
+++ b/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl
@@ -46,6 +46,7 @@
               <li><i class="glyphicon glyphicon-cog icon-muted"></i><a href="https://github.com/Pylons/pyramid">Github Project</a></li>
               <li><i class="glyphicon glyphicon-globe icon-muted"></i><a href="irc://irc.freenode.net#pyramid">IRC Channel</a></li>
               <li><i class="glyphicon glyphicon-home icon-muted"></i><a href="http://pylonsproject.org">Pylons Project</a></li>
+            </ul>
           </div>
         </div>
         <div class="row">
-- 
cgit v1.2.3