chiark / gitweb /
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)
* '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.


Trivial merge