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

[Kevin Fenzi]

commit 1613645dc5bc83e01822d0d91563507d4f9295fc
Merge: 99d48c3 f017a6c
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Tue Jul 1 11:49:24 2014 -0600

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

 cgit-0.10.1-raw-patch.patch |   10 ----------
 cgit.spec                   |   13 +++++++------
 sources                     |    4 ++--
 3 files changed, 9 insertions(+), 18 deletions(-)
---