[hiera/epel7: 2/4] Merge branch 'master' into epel7

[stevetraylen]

commit 001c7d25bff54f28f95d9bd246bff8a09c3c2538
Merge: 74f942a 57d66ab
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Wed May 14 11:23:57 2014 +0000

    Merge branch 'master' into epel7

 hiera.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---