Dmitry Pyzhov 4e77cc3038 Merge remote-tracking branch 'origin/master' into no-rhel-ks ... Conflicts: deployment/puppet/cobbler/manifests/distro/rhel63-x86_64.pp deployment/puppet/cobbler/manifests/distro/rhel63_x86_64.pp deployment/puppet/cobbler/manifests/profile/rhel63-x86_64.pp deployment/puppet/cobbler/manifests/profile/rhel63_x86_64.pp deployment/puppet/cobbler/templates/kickstart/rhel.ks.erb		2013-09-02 19:28:55 +04:00
..
centos63_x86_64.pp	those files should be licensed for sure	2013-09-02 18:57:15 +04:00
centos63-x86_64.pp	those files should be licensed for sure	2013-09-02 18:57:15 +04:00
centos64_x86_64.pp	those files should be licensed for sure	2013-09-02 18:57:15 +04:00
ubuntu_1204_x86_64.pp	those files should be licensed for sure	2013-09-02 18:57:15 +04:00