Manual merge 5.0->5.1
Kristofer Pettersson authored
6b2bd29a
Name Last commit Last update
..
charsets
.cvsignore
Makefile.am
errmsg.txt