foobar
more foo bar
Merge branch 'master' of https://github.com/edvm/pymyadmin

Conflicts:
	pymyadmin/templates/admin/base.html