Merge branch 'debian-wheezy' into debian-squeeze-bponbd-debian-3.2-4_deb7u5_bpo60+1
commitd2b5a226dbfad7caae56983534731f052dc80e91
authorWouter Verhelst <w@uter.be>
Thu, 21 May 2015 15:27:32 +0000 (21 17:27 +0200)
committerWouter Verhelst <w@uter.be>
Thu, 21 May 2015 15:27:32 +0000 (21 17:27 +0200)
tree03385e72ca7a69039ac8f5331a79dc81f78818f8
parent26828a52de05b9cfe78f439a1efd5768c706094b
parente0e80f4ee57bfd7d460a00da2e30b5d9f14ae174
Merge branch 'debian-wheezy' into debian-squeeze-bpo

Add fix for CVE-2013-7441, too.

Conflicts:
debian/changelog
debian/changelog
nbd-server.c