[cgit/el6: 2/2] Merge remote-tracking branch 'origin/master' into el6

[Kevin Fenzi]

commit dc09719ac106d7fc605b3c4934ca2dedc1cd9162
Merge: b3cb9f4 1f090cf
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Sat May 17 11:45:41 2014 -0600

    Merge remote-tracking branch 'origin/master' into el6

 cgit.spec |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)
---