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

[Orion Poplawski]

commit 63101d348edf866f38902316462dab49f5ffcba9
Merge: 8093560 0926425
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Wed Dec 31 09:54:19 2014 -0700

    Merge branch 'master' into f20

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