[openstack-utils/el6: 2/2] Merge branch 'master' into el6

[Pádraig Brady]

commit 6e765001b6ac4c0d9ae5f443da882e1836457907
Merge: c7212bb 0d2f5f2
Author: Pádraig Brady <P at draigBrady.com>
Date:   Mon Jun 23 11:26:33 2014 +0100

    Merge branch 'master' into el6

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