Merge branch 'master' of github.com:bradleyayers/django-tables2
authorBradley Ayers <bradley.ayers@enigmainteractive.com>
Mon, 20 Jun 2011 05:51:46 +0000 (15:51 +1000)
committerBradley Ayers <bradley.ayers@enigmainteractive.com>
Mon, 20 Jun 2011 05:51:46 +0000 (15:51 +1000)

Trivial merge