# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1429563143 -7200
# Node ID 7e5a0c784880bf8da968710948f3aa617403bf5a
# Parent  5a051d86fc6325c609712beab1bdf1b3447e45f9# Parent  bd4f453a00553ed0ea3016596621106293acbf7d
Merge stable

diff -r 5a051d86fc63 -r 7e5a0c784880 LICENSE.md
--- a/LICENSE.md	Mon Apr 20 19:27:33 2015 +0200
+++ b/LICENSE.md	Mon Apr 20 22:52:23 2015 +0200
@@ -92,7 +92,7 @@
 -------
 
 Kallithea incorporates some code from the Javascript system called
-[Mergely](http://http://www.mergely.com/), version 3.3.9.
+[Mergely](http://www.mergely.com/), version 3.3.9.
 [Mergely's license](http://www.mergely.com/license.php), a
 [copy of which is included in this repository](LICENSE-MERGELY.html),
 is (GPL|LGPL|MPL).  Kallithea as GPLv3'd project chooses the GPL arm of that
diff -r 5a051d86fc63 -r 7e5a0c784880 kallithea/templates/pullrequests/pullrequest_data.html
--- a/kallithea/templates/pullrequests/pullrequest_data.html	Mon Apr 20 19:27:33 2015 +0200
+++ b/kallithea/templates/pullrequests/pullrequest_data.html	Mon Apr 20 22:52:23 2015 +0200
@@ -82,7 +82,7 @@
   </table>
 </div>
 
-%if pager in pullrequests:
+%if pullrequests.pager:
 <div class="notification-paginator">
   <div class="pagination-wh pagination-left">
   ${pullrequests.pager('$link_previous ~2~ $link_next', **request.GET.mixed())}