If --dns-name is specified, set it as DHCP host-name
in preference to the --hostname field.
Moved checkbox to left of button label for buttons "Delete" and
"Really" and also added a newline between the buttons.
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.
Very minor formatting change.
Removed a space before the colon when dumping variables. Making it easier to parse.
Fixed type-O in regex for cloudlinux6
Merge pull request #1011 from bentlema/master

Fixed type-O in regex for cloudlinux6
Get rid of the since 2.4 deprecated field 'subnet'.
Merge pull request #1015 from jmaas/master

Get rid of the since 2.4 deprecated field 'subnet'.
Remove deprecated field 'bonding_master'.
Merge pull request #1016 from jmaas/master

Remove deprecated field 'bonding_master'.
Get rid of deprecated "bonding" field.
Merge pull request #1017 from jmaas/master

Get rid of deprecated "bonding" field.
Get rid of deprecated "bonding" field.
Merge branch 'master' of github.com:jmaas/cobbler
Merge pull request #1018 from jmaas/master

Forgot to update DEPRECATED_FIELDS
Fix Django exceptions when lists (eg. distro/profiles) are empty.
Merge pull request #1019 from jmaas/master

Fix Django exceptions when lists (eg. distro/profiles) are empty.
CentOS 7 has a release of 7.0.1406

> rpm -qf /etc/redhat-release
centos-release-7-0.1406.el7.centos.2.3.x86_64
> cat /etc/redhat-release
CentOS Linux release 7.0.1406 (Core)
Minor update to CSS; make better use of screen (tables).
Merge pull request #1022 from jmaas/master

Minor update to CSS; make better use of screen (tables).