[help2man/f17: 2/2] Merge remote-tracking branch 'origin/f18' into f17

[corsepiu]

commit f63ffc4f85ed4ba31af75e4cdb8160679db8a739
Merge: e58f174 94deb02
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date:   Thu Oct 4 07:59:10 2012 +0200

    Merge remote-tracking branch 'origin/f18' into f17

 .gitignore    |    2 +-
 help2man.spec |    5 ++++-
 sources       |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)
---