From: Karel Zak <kzak@redhat.com>
Date: Thu, 13 Jun 2013 11:32:02 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/eric-s-raymond/util-linux
X-Git-Tag: v2.24-rc1~501
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=321063178971c4c200d4260ddcc207915f9dbba0;p=thirdparty%2Futil-linux.git

Merge branch 'master' of https://github.com/eric-s-raymond/util-linux

* 'master' of https://github.com/eric-s-raymond/util-linux:
  Fix broken list syntax.
  Restore use of correct alternation syntax using { | }.
  Re-layout a FILES section in the traditional style.
  Remove another .ti for .RS/.RE, and remove a .TP that broke list parsing.
  Replace .IP o with .IP \(bu, using the [nt]roff bullet character.
  Replace .ti operations with equivalent .RS/.RE pairs.
---

321063178971c4c200d4260ddcc207915f9dbba0