commit 95ef264ebab11e76adf523f8196b3f3ad5ae34ae
Merge: 4cc85f4c b8dfaffc
Author:     Simon Howard <fraggle+github@gmail.com>
AuthorDate: Mon Feb 3 07:06:03 2014 -0800
Commit:     Simon Howard <fraggle+github@gmail.com>
CommitDate: Mon Feb 3 07:06:03 2014 -0800

    Merge pull request #329 from fabiangreffrath/master

    Some improvements to the build system

 data/Makefile.am |  1 +
 man/Makefile.am  | 51 +++++++++++++++++++++++++++++++--------------------
 2 files changed, 32 insertions(+), 20 deletions(-)