Merge branch 'check_conflicts'
authorFlorian Ragwitz <rafl@debian.org>
Fri, 3 Jul 2009 23:31:45 +0000 (23:31 +0000)
committerFlorian Ragwitz <rafl@debian.org>
Fri, 3 Jul 2009 23:31:45 +0000 (23:31 +0000)
commitf4c1afd4d4a0d0df15f750eaba9ea141c56409a2
tree535c32c3ad382d61664969d65a0c230b1ae87725
parentf913be31f216eecb9f104573e20daf96f5cdedf1
parent27c47255d4bd1cc7456c847327b18569ff6b46f0
Merge branch 'check_conflicts'

check_conflicts:
Port to Module::Install::CheckConflicts.
Create branch check_conflicts

Conflicts:
Makefile.PL
Makefile.PL