+ readme Django 1.6 notice.
* version
Merge remote-tracking branch 'origin/master' into 1.0.0
Revert "Merge remote-tracking branch 'origin/master' into 1.0.0"

This reverts commit a3c33409ccaf54461bc3af3ff56420762abe421e, reversing
changes made to b6f3b1bf974d6317d0bc224afaa3d60c41839bd4.