caktus/django-pagelets — pull request #52 by rebecca-caktus (2014-02-04 14:12:39+00:00)
Title: Merge develop into master

At some point, develop and master got out of sync - these are the last few commits from develop.