Merge branch 'mirbsd'

diff --cc configure.in
index b544ded,e1af79f..eb12bcb
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -17,12 -19,10 +17,12 @@@ but WITHOUT ANY WARRANTY; without even 
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU General Public License for more details.])
  
- AC_INIT([Concurrent Versions System (CVS)],[1.12.13-MirDebian-20],
 -AC_INIT([Concurrent Versions System (CVS)],[1.12.13-MirOS-0AB7.7],
 -      [miros-discuss@mirbsd.org],[cvs])
++AC_INIT([Concurrent Versions System (CVS)],[1.12.13-MirDebian-21],
 +      [bug-cvs@nongnu.org],[cvs])
  AC_CONFIG_SRCDIR(src/cvs.h)
 +AC_CONFIG_AUX_DIR(build-aux)
  AM_INIT_AUTOMAKE([gnu 1.9.2 dist-bzip2 no-define])
 +AM_GNU_GETTEXT_VERSION([0.14.4])
  AC_PREREQ(2.59)
  
  AC_PREFIX_PROGRAM(cvs)

diff --cc src/main.c
Simple merge

diff --cc src/root.c
Simple merge