documentation hint about django-nose and south, r=ErikRose
upgrade playdoh-lib for latest django-session-csrf, r=Osmose
Merge branch 'master' of github.com:mozilla/playdoh
upgrading playdoh, so the stackato will start working (I wish ...)
stackato settings added (still failing)
some changes to make the stuff working
vendor submodule removed for stackato
funfactory requirements copied
Merge branch 'stackato' of github.com:zalun/kitchensinkserver into stackato

Conflicts:
	requirements/prod.txt
	stackato.yml