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

[Kevin Fenzi]

commit d472d041f85985077a376bf196b47f1688054148
Merge: e55e6e6 76866de
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Thu Nov 15 10:54:58 2012 -0700

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

 .gitignore |    1 +
 cgit.spec  |   23 +++++++++++++++--------
 sources    |    2 +-
 3 files changed, 17 insertions(+), 9 deletions(-)
---