Merge remote-tracking branch 'origin/man-pages'
authorStefan Schantl <stefan.schantl@ipfire.org>
Sun, 8 Feb 2015 22:05:27 +0000 (23:05 +0100)
committerStefan Schantl <stefan.schantl@ipfire.org>
Sun, 8 Feb 2015 22:05:27 +0000 (23:05 +0100)
commit77eb26be532d9860691ecdf0fc6f224014b16bd0
tree0c15b8119b3ca44d10c5c31ff30025b9be77cdeb
parent6b81b43c62e9ffc8a950469a9250e68412372dea
parentf6719cee968d334603b07883a8afbc146a80026e
Merge remote-tracking branch 'origin/man-pages'

Conflicts:
configure.ac
Makefile.am
configure.ac