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

[Orion Poplawski]

commit 697366892b81c3e42ea8aed074d75cce16361086
Merge: 6b062fe 8ca6546
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Sun Oct 19 23:00:36 2014 -0600

    Merge branch 'master' into epel7

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