]> err.no Git - util-linux/commit
Merge commit 'origin/stable/v2.14' into stable/v2.14
authorLaMont Jones <lamont@debian.org>
Tue, 12 Aug 2008 05:58:28 +0000 (23:58 -0600)
committerLaMont Jones <lamont@debian.org>
Tue, 12 Aug 2008 05:58:28 +0000 (23:58 -0600)
commitd5aaae24315bcaa04439216e5a074fe17efaede2
tree495abdcb763dc3d10f102ab909d0fc080dd1c580
parentac62e19584d223d2121cc1277e2f605cc920351c
parent71876a1be437fec90d67bae4d30a4525aa51db4b
Merge commit 'origin/stable/v2.14' into stable/v2.14

Conflicts:

mount/Makefile.am
mount/Makefile.am
mount/lomount.c
mount/lomount.h
mount/mount.8