[cobbler/epel7: 5/5] Merge branch 'master' into epel7

[Orion Poplawski]

commit bc8f55d58c64a6f665b6d570ff6e0c12ada3b950
Merge: c0fdc52 681c8ab
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Thu Jul 17 10:04:53 2014 -0600

    Merge branch 'master' into epel7

 .gitignore   |    1 +
 cobbler.spec |  226 ++++++++++++++++++++++++++--------------------------------
 sources      |    2 +-
 3 files changed, 103 insertions(+), 126 deletions(-)
---
diff --cc .gitignore
index e7e7f8b,6143121..44cf2be
--- a/.gitignore
+++ b/.gitignore
@@@ -11,6 -11,6 +11,7 @@@ cobbler-2.0.5.tar.g
  /cobbler-2.2.3.tar.gz
  /cobbler-2.4.0.tar.gz
  /cobbler-2.4.3.tar.gz
 +/cobbler-2.4.4.tar.gz
  /cobbler-2.6.0.tar.gz
  /cobbler-2.6.1.tar.gz
+ /cobbler-2.6.2.tar.gz