i18n
Merge branch 'master' of https://github.com/nippo/django-ipsum

Conflicts:
	ipsum/locale/fr/LC_MESSAGES/django.po