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

[Alan Pevec]

commit 6aa466ef903ca52b805e9cea68f59c75cb96d8fd
Merge: 3b02bb5 fd0cdf4
Author: Alan Pevec <apevec at redhat.com>
Date:   Wed Apr 9 03:03:55 2014 +0200

    Merge branch 'master' into el6-icehouse

 .gitignore                                  |    1 +
 0001-remove-runtime-dep-on-python-pbr.patch |   13 ++++++-------
 openstack-keystone.spec                     |    8 ++++----
 sources                                     |    2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)
---