From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Thu, 19 May 2011 12:01:53 +0000 (-0700)
Subject: Merge pull request #36 from afandian/patch-1
X-Git-Tag: 2.6~10^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6057afaa6b305e3a486480dbca030456048cefcf;p=thirdparty%2Fjinja.git

Merge pull request #36 from afandian/patch-1

Kampala is the capital of Uganda!
---

6057afaa6b305e3a486480dbca030456048cefcf