Merge pull request #65 from jmaas/master

Cobbler release 2.6.1