merger from https://github.com/mhagger/cvs2svn.git