[condor/f20: 4/4] Merge branch 'f19' into f20

[tstclair]

commit 8b585345bff5eb4a0a0bf20ac8c168c92f419899
Merge: 14f719a 4198257
Author: Timothy St. Clair <tstclair at redhat.com>
Date:   Wed Sep 25 15:15:30 2013 -0500

    Merge branch 'f19' into f20

 condor.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---