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

[stevetraylen]

commit 36a14203f892ed7aa2c051a12ad35dd3228ea570
Merge: 001c7d2 839bc58
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Wed May 14 11:27:56 2014 +0000

    Merge branch 'master' into epel7

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