cobbler/cobbler — pull request #1314 by alanoe (2014-10-21 16:40:49+00:00)
Title: Fix regressions in kickstart => autoinstall renaming

Also, delete merge files added by accident previously.