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

[Orion Poplawski]

commit 283c4712bf02e24d9a0208938656d5ecab81583c
Merge: f1dea1d 63101d3
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Wed Dec 31 09:55:23 2014 -0700

    Merge branch 'f20' into f19

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