[cobbler/f19: 2/2] Merge branch 'f19' of ssh://pkgs.fedoraproject.org/cobbler into f19

[jimi]

commit e557733e61c19f2c74b4d24a4414bfbda59673db
Merge: 7150fb7 a0f637a
Author: James Cammarata <jimi at sngx.net>
Date:   Fri May 24 16:27:02 2013 -0500

    Merge branch 'f19' of ssh://pkgs.fedoraproject.org/cobbler into f19
    
    Conflicts:
    	cobbler.spec

 cobbler.spec |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---