commit f7d72269b4f498e732cdb4ca7c340a9f3371ca44
Merge: 46d8b9d 01f9e71
Author: Derek Higgins <derekh(a)redhat.com>
Date: Mon Apr 1 00:41:18 2013 +0100
Merge branch 'el6-grizzly'
Conflicts:
.gitignore
openstack-packstack.spec
sources
.gitignore | 11 ++---------
openstack-packstack.spec | 33 ++++++++++++++++++++++-----------
sources | 2 +-
3 files changed, 25 insertions(+), 21 deletions(-)
---