[cobbler/f20: 2/2] Update to 2.6.3 from master

[Orion Poplawski]

commit c9736df8552075f6a8627ea391a6a7ece3951877
Merge: 7797a4b ff608c4
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Fri Jul 18 16:53:56 2014 -0600

    Update to 2.6.3 from master

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