Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/misc
authorMark Wooding <mdw@distorted.org.uk>
Thu, 2 Jun 2016 22:48:37 +0000 (23:48 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Thu, 2 Jun 2016 22:48:37 +0000 (23:48 +0100)
commit17c8a354fead6699ceec9b8ab4ed852bbe7b7e0a
tree9ea62b14e731fa80705b1dfba241865092e4f811
parenta3da5859f4e3e63baa285a25b95e9211efbb9f75
parente55151af41ff0e55c5dbd0e0c83f142e0365717d
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.