Merge branch 'mg/cvsimport'

* mg/cvsimport:
cvsimport: handle the parsing of uppercase config options
cvsimport: partial whitespace cleanup

diff --cc git-cvsimport.perl
Simple merge