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

[lzap]

commit 74d77732ff63d028e312905556f5879127e6d6fc
Merge: 681de69 df03ac7
Author: Lukas Zapletal <lzap+git at redhat.com>
Date:   Tue Aug 19 10:38:18 2014 +0200

    Merge branch 'master' into epel7
    
    Added 1131398 patch for SELinux.

 puppet.spec |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)
---