Typo
Merge branch 'master' of https://github.com/zenphoto/zenphoto
French translation update
Unnnecessart cide
6be88ac9b45310b6759e20c6d210285b63b6f84f
Merge remote-tracking branch 'upstream/master'

Conflicts:
	zp-core/locale/fr_FR/LC_MESSAGES/zenphoto.mo
	zp-core/locale/fr_FR/LC_MESSAGES/zenphoto.po
	zp-core/locale/nl_NL/LC_MESSAGES/zenphoto.mo
	zp-core/locale/nl_NL/LC_MESSAGES/zenphoto.po