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

[Pádraig Brady]

commit e5cb28f6d2b64ba6de81e14176edeef2e770fe24
Merge: b85bccd 0f31913
Author: Pádraig Brady <P at draigBrady.com>
Date:   Mon Jan 6 09:41:09 2014 +0000

    Merge branch 'master' into el6-icehouse

 openstack-keystone.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---