Disallow kickstarts in /etc/cobbler. Fix for #939 and CVE-2014-3225.
Restrict kickstart/snippet paths. Fix for #939 and CVE-2014-3225.
Usability. Return to kickstart/snippet list after save.
Merge pull request #1071 from jmaas/release26

Fixes for #939 and CVE-2014-3225
Merge pull request #1062 from opoplawski/release26

Spec cleanup
Add missing icons to cobbler_web/content. Fixes #679.
Add cobbler-web icons to packaging.
Merge pull request #1073 from jmaas/release26

Add missing icons to cobbler-web. Fixes #679
Cobbler release 2.6.3
Merge pull request #1074 from jmaas/release26

Cobbler release 2.6.3
Modified the height of the text area used for editing snippets and
kickstarts to make it shorter. If user wants to make it longer, they
can extend it while editing.
Moved checkbox to left of button label for buttons "Delete" and
"Really" and also added a newline between the buttons.
Merge pull request #1075 from jmaas/release26

cobbler-web improvements
Prevent disappearing profiles after cobblerd restart (#1030).

This diff makes the use of --parent and --distro mutually exclusive.
The consequence is that subprofiles always have the same distro as
the parent profile. I think this has been the intended behaviour
ever since subprofiles got introduced, now it's just better enforced.

This diff also checks for assciated subprofiles first when you try to
delete a parent profile, this should prevent data corruption. Of
course using the 'recursive' flag is still supported.

Cobbler-web has been adjusted to use the (safer) xapi_object_edit API
for the deletion of items.

Conflicts:
	cobbler/remote.py
	web/cobbler_web/views.py
Merge pull request #1087 from jmaas/release26

Prevent disappearing profiles after cobblerd restart (#1030).
Fix broken gitdate, gitstamp values in version file.
Merge pull request #1089 from jmaas/release26

Fix broken gitdate, gitstamp values in version file.
Make kickstart selectable from a pulldown list in cobbler-web (#991).
Merge pull request #1092 from jmaas/release26

Make kickstart selectable from a pulldown list in cobbler-web (#991).
The fix for #991 broke "image"; this patch fixes that.