[heat-cfntools/epel7: 7/7] Merge branch 'master' into epel7

[Jeff Peeler]

commit fd4beaa3ab3386c55a34d1b03267e8cdd024fff3
Merge: 7b1da87 c27680a
Author: Jeff Peeler <jpeeler at redhat.com>
Date:   Thu Jun 26 11:18:00 2014 -0400

    Merge branch 'master' into epel7
    
    Conflicts:
    	.gitignore
    	heat-cfntools.spec
    	sources

 .gitignore         |    1 +
 heat-cfntools.spec |   15 ++++++++++++---
 sources            |    2 +-
 3 files changed, 14 insertions(+), 4 deletions(-)
---