jtakayama/makahiki — pull request #4 by jtakayama (2013-12-04 01:03:11+00:00)
Title: Merging Django 1.6 changes into branch one-page-configuration.

Merging Django 1.6 changes into branch one-page-configuration.