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

[Orion Poplawski]

commit 9c9b345fefdb3e2b61d777541436804ed3272041
Merge: eb8825b ff608c4
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Fri Jul 18 16:56:45 2014 -0600

    Merge branch 'master' into el6

 .gitignore   |    1 +
 cobbler.spec |    5 ++++-
 sources      |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---