Move Koan-LiveCD to contrib; adjust Makefile accordingly.
Merge pull request #1099 from jmaas/master

Move Koan-LiveCD to contrib; adjust Makefile accordingly.
Minor adjustment to the error_page template (cobbler-web).
Move contrib items to directories.
Remove Func from /etc/cobbler/settings; Func has been moved to contrib.
Merge pull request #1100 from jmaas/master

A few small changes
Func settings removal from cobbler/settings.py.
Merge pull request #1104 from jmaas/master

Func settings removal from cobbler/settings.py.
Don't allow kickstarts in /etc/cobbler.
Merge pull request #1105 from jmaas/master

Don't allow kickstarts in /etc/cobbler.
Add strict kickstart check in the API, again should fix #939.
Merge pull request #1111 from jmaas/master

Add strict kickstart check in the API, again should fix #939.
Don't send the Puppet environment when system status is empty (#560).
Merge pull request #1112 from jmaas/master

Don't send the Puppet environment when system status is empty (#560).
Prohibit object renaming through the modifty_item API (#1079).

The appropiate rename_* API's should be used for renaming objects.
Merge pull request #1115 from jmaas/master

Prohibit object renaming through the modifty_item API (#1079).
This fixes edits/adds to multiple interfaces in cobbler-web (#687).
Merge pull request #1117 from jmaas/master

This fixes edits/adds to multiple interfaces in cobbler-web (#687).
Revert "Prohibit object renaming through the modifty_item API (#1079)."

This reverts commit 7ac2552ccea7b3a3e0a879a5cfa79ed1d0378e41.
Merge pull request #1119 from jmaas/master

Revert "Prohibit object renaming through the modifty_item API (#1079)."