was encoded twice
Merge branch 'master' of melon:/git/pub/char/charinfo

Conflicts:
	char.cgi