From: Michael Elsdoerfer <michael@elsdoerfer.com>
Date: Mon, 22 Nov 2010 15:01:00 +0000 (+0100)
Subject: Merge remote branch 'jweyrich/master'
X-Git-Tag: 0.2.1~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=02ecf618eebcdf59e783412b8b4d96c59eeb3d7f;p=django-tables2.git

Merge remote branch 'jweyrich/master'
---

02ecf618eebcdf59e783412b8b4d96c59eeb3d7f