git
Merge branch 'master' of github.com:serandres/django

Conflicts:
	django