[SCM] clone of the legendary first person shooter Doom branch, master, updated. upstream/2.5.0+dfsg1-19-g1125a27

[Jon Dowland]

The following commit has been merged in the master branch:
commit cfbde726ff3c175767a8027a3350eb740bfddceb
Merge: d2455ac2743ea663b44aef995dd01a34a60c6435 0e0b2e94696001a65d07b2fd3adc1ae954e95c64
Author: Jon Dowland <jmtd at debian.org>
Date:   Fri Sep 3 15:42:46 2010 +0100

    Merge branch 'patch_readme_customization'


-- 
clone of the legendary first person shooter Doom