]> err.no Git - util-linux/commitdiff
projects / util-linux / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f1bf0e3 347d745)
Merge branch 'stable/v2.13'
authorLaMont Jones <lamont@debian.org>
Thu, 13 Mar 2008 15:55:49 +0000 (09:55 -0600)
committerLaMont Jones <lamont@debian.org>
Thu, 13 Mar 2008 15:55:49 +0000 (09:55 -0600)
Conflicts:

disk-utils/mkswap.8
disk-utils/mkswap.c


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.