From: Martin Zobel-Helas <zobel@debian.org>
Date: Wed, 20 Jun 2012 21:33:40 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://db.debian.org/git/debian.org
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=1fd90aa5adbecfea87d6d58dc168533ae444c780;p=dsa-metapackages.git

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
---

1fd90aa5adbecfea87d6d58dc168533ae444c780
diff --cc debian/changelog
index 903bb95,7a54eb5..5a23111
--- a/debian/changelog
+++ b/debian/changelog
@@@ -8,10 -5,11 +5,14 @@@ debian.org (49) XXstable; urgency=lo
    * Add i18n.debian.org
    * Add l10n.debian.org
  
 +  [ Martin Zobel-Helas ]
 +  * decline to have LoadModule and LoadFile in vhosts
 +
-  -- Peter Palfrader <weasel@debian.org>  Wed, 23 May 2012 16:22:27 +0200
+   [ 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