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

[Kevin Fenzi]

commit 99d48c3c3ba759e801b808001bdc03ba420ed216
Merge: dc09719 d0b0c57
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Wed Jun 11 21:28:28 2014 -0600

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

 cgit-0.10.1-raw-patch.patch |   10 ++++++++++
 cgit.spec                   |   10 +++++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---