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

[Orion Poplawski]

commit 809356097250a9cb7b5c3e920bbb638dc585f2fb
Merge: a533f64 8ca6546
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Sun Oct 19 22:59:23 2014 -0600

    Merge branch 'master' into f20

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