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

[Orion Poplawski]

commit 8ff60d22d03b3c5c654cdf06e7ce2b1ecf3a159c
Merge: c9736df cc33bc9
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Mon Aug 11 10:17:24 2014 -0600

    Merge branch 'master' into f20

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