kerosine-20 Django south integration
Merge remote-tracking branch 'origin/master'
just a comment