From: Bradley Ayers <bradley.ayers@enigmainteractive.com>
Date: Tue, 7 Jun 2011 03:16:40 +0000 (+1000)
Subject: Merge branch 'development'
X-Git-Tag: v0.5.0
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5d74c7ef6a6a528f22bac58746677e20c6fc24b8;p=django-tables2.git

Merge branch 'development'
---

5d74c7ef6a6a528f22bac58746677e20c6fc24b8