[bcfg2/el6: 7/7] Merge branch 'master' into el6: Updates for EPEL7

[John Morris]

commit 5931d0748f0daf2cb5ea2a9e4a688523a3be00bb
Merge: 8599248 656ff8c
Author: John Morris <john at zultron.com>
Date:   Mon Feb 3 11:09:16 2014 -0600

    Merge branch 'master' into el6:  Updates for EPEL7
    
    Conflicts:
    	bcfg2.spec

 bcfg2.spec |   60 +++++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 49 insertions(+), 11 deletions(-)
---