Merge branch 'master' of git+ssh://db.debian.org/git/debian.org

* 'master' of git+ssh://db.debian.org/git/debian.org:
  lintian wants hardening-includes (>= 2.0)

Conflicts:
	debian/changelog

diff --combined debian/changelog
index 903bb9549cc324404da3951d01b4df1dc4c79882,7a54eb5f5611aea8f9176bf96571058a7cd1cd95..5a23111f03781654184ee6ba3cf444e99a552a7a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,15 +1,18 @@@
  debian.org (49) XXstable; urgency=low
  
-   [ Peter Palfrader ]
-   * 
- 
    [ Felipe Augusto van de Wiel (faw) ]
    * Add ddtp.debian.org
    * Add i18n.debian.org
    * Add l10n.debian.org
  
-  -- Peter Palfrader <weasel@debian.org>  Wed, 23 May 2012 16:22:27 +0200
 +  [ Martin Zobel-Helas ]
 +  * decline to have LoadModule and LoadFile in vhosts
 +
+   [ Peter Palfrader ]
+   * lintian:
+     - hardening-includes (>= 2.0)
+ 
+  -- Peter Palfrader <weasel@debian.org>  Wed, 20 Jun 2012 06:55:54 +0200
  
  debian.org (48) unstable; urgency=low