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

[stevetraylen]

commit 74f942a20528c3814b5ffdd10c219248838de983
Merge: 88e0c27 27bf53b
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Thu Feb 13 16:35:44 2014 +0000

    Merge branch 'master' into epel7
    
    Conflicts:
    	hiera.spec

 .gitignore |    1 +
 hiera.spec |   10 +++++++---
 hiera.yaml |   13 -------------
 sources    |    2 +-
 4 files changed, 9 insertions(+), 17 deletions(-)
---