[cobbler/el6: 4/4] Merge branch 'master' into el6

[Orion Poplawski]

commit a9827b2cf3d1d8ed85fa350fb0feb3f51bd5840c
Merge: 9c9b345 4ac97e8
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Fri Aug 15 15:55:06 2014 -0600

    Merge branch 'master' into el6

 .gitignore   |    2 ++
 cobbler.spec |   13 +++++++++++--
 sources      |    2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)
---