[koji/el6: 2/2] Merge branch 'master' into el6

[Dennis Gilmore]

commit ef0547ba73c7d20bc13e8f87995d224d3ec0387e
Merge: 36a898c 563e926
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Wed Jul 31 09:08:40 2013 -0500

    Merge branch 'master' into el6

 koji.spec |    5 ++++-
 sources   |    2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)
---