chiark / gitweb /
Merge branch 'master' of git+ssh://db.debian.org/git/debian.org
authorMartin Zobel-Helas <zobel@debian.org>
Wed, 20 Jun 2012 21:33:40 +0000 (23:33 +0200)
committerMartin Zobel-Helas <zobel@debian.org>
Wed, 20 Jun 2012 21:33:40 +0000 (23:33 +0200)
commit1fd90aa5adbecfea87d6d58dc168533ae444c780
treeb762aa490ffd14370ea4e2e3b28531d7680e54da
parente283755feb7da552dfad6fce6a5b9ddab8e2460f
parent21a6385205adc577e849613146572ba17991cf85
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
debian/changelog