[cgit/el6: 4/4] Merge branch 'master' into el6

[Todd Zullinger]

commit 460f2e7d762015d0417ce958858102f6fc325441
Merge: 3505e1c 0cb92fb
Author: Todd Zullinger <tmz at pobox.com>
Date:   Mon May 27 21:40:26 2013 -0400

    Merge branch 'master' into el6

 .gitignore |    4 ++--
 cgit.spec  |   18 ++++++++++++++----
 sources    |    4 ++--
 3 files changed, 18 insertions(+), 8 deletions(-)
---