commit a06329ef328b3f0bc93e319647e8a620ac65e03d Merge: 67a9da9 f2ef8d1 Author: Ximin Luo infinity0@gmx.com Date: Fri Dec 6 19:56:22 2013 +0000

Merge branch 'help2man'

facilitator/.gitignore | 1 + facilitator/HACKING | 2 +- facilitator/INSTALL | 2 +- facilitator/Makefile.am | 13 ++++++--- facilitator/configure.ac | 2 +- facilitator/mkman.inc | 1 + facilitator/mkman.sh | 1 + mkman.inc | 9 +++++++ mkman.sh | 55 +++++++++++++++++++++++++++++++++++++++ proxy/modules/nodejs/.gitignore | 1 + proxy/modules/nodejs/Makefile | 18 +++++++++++-- 11 files changed, 97 insertions(+), 8 deletions(-)