From: Michael Elsdörfer <michael@elsdoerfer.info>
Date: Thu, 14 Jan 2010 18:27:22 +0000 (+0100)
Subject: Merge upstream.
X-Git-Tag: 0.2~29
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bb18417a31088bb12bc23a4d1fe4cd8d7430cd63;p=django-tables2.git

Merge upstream.
---

bb18417a31088bb12bc23a4d1fe4cd8d7430cd63