commit 78bf263bad920c298f26bc38ef44258eed99cae3 Merge: 5a37b62 b47d294 Author: Timothy St. Clair <tstclair at redhat.com> Date: Wed Mar 7 14:12:42 2012 -0600 Merge branch 'f17' .gitignore | 1 + condor.spec | 7 +++---- sources | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) ---