xorg-docs: Changes to 'master'

[David Nusinow <dnusinow@alioth.debian.org>]

 debian/changelog |    6 +++---
 debian/control   |    2 --
 2 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 019559032638bcf4d34729e8e12d0289eef014a2
Author: David Nusinow <dnusinow@debian.org>
Date:   Sat Dec 16 17:23:32 2006 -0500

    Prepare changelog for upload

commit 7fe6b0deae44844871a3bedbbdce65d1e320849e
Author: David Nusinow <dnusinow@debian.org>
Date:   Sat Dec 16 17:22:39 2006 -0500

    Revert "* Add XS-Vcs-Git and XS-Vcs-Browse fields to the control file."
    
    This reverts commit 0a58a99b7b16bb306b0ccc503768255304226a44.
    
    Conflicts:
    
    	debian/changelog