[openstack-utils/epel7: 4/4] Merge branch 'master' into epel7

[Pádraig Brady]

commit e17f7cba885b479c6c20b27654b388d5b563154f
Merge: 180241e 1d80da8
Author: Pádraig Brady <P at draigBrady.com>
Date:   Thu Apr 24 17:16:34 2014 +0100

    Merge branch 'master' into epel7

 .gitignore           |    2 ++
 openstack-utils.spec |   10 ++++++++--
 sources              |    2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)
---