[autoconf-archive/epel7: 3/3] Merge branch 'master' into epel7

[David King]

commit eb4cccf2339cf8f222c27eec1113e94278e148ec
Merge: 6bbba1d 7fb5b4d
Author: David King <amigadave at amigadave.com>
Date:   Tue Feb 24 12:41:36 2015 +0000

    Merge branch 'master' into epel7

 .gitignore            |  1 +
 autoconf-archive.spec | 13 ++++++++++---
 sources               |  2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)
---