From: Mark Wooding <mdw@distorted.org.uk>
Date: Thu, 2 Jun 2016 22:48:37 +0000 (+0100)
Subject: Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/misc
X-Git-Tag: 1.4.2.1~1
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/misc/commitdiff_plain/17c8a354fead6699ceec9b8ab4ed852bbe7b7e0a

Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/misc

* 'master' of git.distorted.org.uk:~mdw/publish/public-git/misc:
  mprlimit: The new name for `prlimit'.
  debian/control: Include `prlimit' and `x86-model' in the metapackage.
---

17c8a354fead6699ceec9b8ab4ed852bbe7b7e0a