[cobbler/f19: 4/4] Merge branch 'f20' into f19

[Orion Poplawski]

commit f1dea1de42e2461a51cd9dec7a2429dbaf299f52
Merge: 38f5249 8093560
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Sun Oct 19 23:00:06 2014 -0600

    Merge branch 'f20' into f19

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