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 --git a/debian/changelog b/debian/changelog
index 7a54eb5f5611aea8f9176bf96571058a7cd1cd95..5a23111f03781654184ee6ba3cf444e99a552a7a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ debian.org (49) XXstable; urgency=low
   * Add i18n.debian.org
   * Add l10n.debian.org
 
+  [ Martin Zobel-Helas ]
+  * decline to have LoadModule and LoadFile in vhosts
+
   [ Peter Palfrader ]
   * lintian:
     - hardening-includes (>= 2.0)