[man2html/el6: 5/5] Merge branch 'master' into el6

[T.C. Hollingsworth]

commit c85d375101ba3f18cc658a0b5dc471360f6a6268
Merge: 3c73d8d a367ab4
Author: T.C Hollingsworth <tchollingsworth at gmail.com>
Date:   Mon Jul 16 07:44:49 2012 -0400

    Merge branch 'master' into el6

 man2html-localized-manpage-paths.patch |   78 ++++++++++++++++++++++++++++++++
 man2html.spec                          |   19 ++++++--
 2 files changed, 93 insertions(+), 4 deletions(-)
---