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

[Orion Poplawski]

commit 16d24f6197175ada45b5e82197359c3aa6328b94
Merge: a9827b2 8ca6546
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Sun Oct 19 23:01:21 2014 -0600

    Merge branch 'master' into el6

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