[cobbler/epel7: 4/4] Update to 2.6.1 from master

[Orion Poplawski]

commit c0fdc52c4d262e791fab45be642ea3df252a8f92
Merge: 57917b0 1053f0e
Author: Orion Poplawski <orion at nwra.com>
Date:   Fri May 23 16:01:23 2014 -0600

    Update to 2.6.1 from master

 .gitignore   |    2 ++
 cobbler.spec |   21 +++++++++++++++------
 sources      |    2 +-
 3 files changed, 18 insertions(+), 7 deletions(-)
---
diff --cc .gitignore
index 5309a6d,ea69d7e..e7e7f8b
--- a/.gitignore
+++ b/.gitignore
@@@ -11,4 -11,5 +11,6 @@@ 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