[openstack-packstack/f20: 2/2] Merge branch 'f20' of ssh://pkgs.fedoraproject.org/openstack-packstack into f20

[Martin Mágr]

commit ee0ed417eea1636e524d08b7c771cd2901cec46d
Merge: 7d06c9b d518c1d
Author: Martin Magr <mmagr at redhat.com>
Date:   Tue Jan 14 12:29:20 2014 +0100

    Merge branch 'f20' of ssh://pkgs.fedoraproject.org/openstack-packstack into f20
    
    Conflicts:
    	.gitignore
    	openstack-packstack.spec
    	sources

 neutron-puppet-3.4.patch           |   55 ++++++++++++++++++++++++++++++++++++
 openstack-packstack.spec           |    6 ++++
 packstack-libvirt_vif_driver.patch |   35 +++++++++++++++++++++++
 packstack-puppet-3.4.patch         |   49 ++++++++++++++++++++++++++++++++
 4 files changed, 145 insertions(+), 0 deletions(-)
---