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

[Orion Poplawski]

commit 20dd58ed42e51ba7e3d9a461e1054d10da4efe60
Merge: 9385f06 cc33bc9
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Mon Aug 11 10:20:48 2014 -0600

    Merge branch 'master' into epel7

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