django 1.5 on stackato
Merge branch 'master' of github.com:homingli/dj15