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

[Orion Poplawski]

commit 3d4efaa54d67bb6b162576b4d3a2aa1fae597cd0
Merge: 6973668 0926425
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Wed Dec 31 09:56:40 2014 -0700

    Merge branch 'master' into epel7

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