]> err.no Git - util-linux/commit
Merge commit 'origin/stable/v2.13' into stable/v2.13
authorLaMont Jones <lamont@debian.org>
Thu, 6 Dec 2007 04:30:43 +0000 (21:30 -0700)
committerLaMont Jones <lamont@debian.org>
Thu, 6 Dec 2007 04:30:43 +0000 (21:30 -0700)
commit74e7d7067805fe67ee2a048e66c4ef71935f835d
treea50f6a77bfc4499e656a28e11cb20ee170fa4c94
parent07f0f4da57e3e482118bacde04a6bf7413b1f453
parentfda9d11739ee88c3b2f22a73f12ec019bd3b8335
Merge commit 'origin/stable/v2.13' into stable/v2.13

Conflicts:

getopt/getopt.1
mount/lomount.c