fixtures
fix
Merge branch 'master' of git://github.com/espern/tiny_website
Merge branch 'master' of git://github.com/espern/tiny_website
Merge branch 'master' of git://github.com/espern/tiny_website
fixed trunk
Merge branch 'master' of git://github.com/espern/tiny_website
Merge branch 'master' of git://github.com/espern/tiny_website
Merge branch 'master' of git://github.com/espern/tiny_website
Merge branch 'master' of git://github.com/espern/tiny_website
Merge branch 'master' of git://github.com/espern/tiny_website
Merge branch 'master' of git://github.com/espern/tiny_website
Merge branch 'master' of git://github.com/espern/tiny_website
Merge branch 'master' of git://github.com/espern/tiny_website

Conflicts:
	languages/fr.py
Merge branch 'master' of git://github.com/espern/tiny_website
Merge branch 'master' of git://github.com/espern/tiny_website
Merge branch 'master' of git://github.com/espern/tiny_website
Merge branch 'master' of git://github.com/espern/tiny_website
Merge branch 'master' of git://github.com/espern/tiny_website
Merge branch 'master' of git://github.com/espern/tiny_website