[hiera/epel7: 3/3] Merge branch 'master' into epel7

[stevetraylen]

commit 6f3faa4d297a47b3d9b2b81787e9cba8faa271f3
Merge: 48e9d27 264cca8
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Wed Jun 11 12:56:25 2014 +0000

    Merge branch 'master' into epel7

 .gitignore |    1 +
 hiera.spec |    8 +++++++-
 sources    |    2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)
---