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

[Orion Poplawski]

commit 9385f062a9bf56b38babb68ae2471b2913eb1aef
Merge: bc8f55d ff608c4
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Fri Jul 18 16:55:45 2014 -0600

    Merge branch 'master' into epel7

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