From: Bradley Ayers <bradley.ayers@enigmainteractive.com>
Date: Mon, 20 Jun 2011 05:51:14 +0000 (+1000)
Subject: Merge branch 'development'
X-Git-Tag: v0.6.0
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cf7f48adbafd87e7b538c1631cd6c9fadd93bb3c;p=django-tables2.git

Merge branch 'development'
---

cf7f48adbafd87e7b538c1631cd6c9fadd93bb3c