[cgit/f13/master: 7/7] Merge branch 'master' into f13

[Todd Zullinger]

commit 96fba24f284334e90b0b269e52ea3a1569219a73
Merge: ab4f1dc 2f0e005
Author: Todd Zullinger <tmz at pobox.com>
Date:   Sun Mar 6 12:31:18 2011 -0500

    Merge branch 'master' into f13

 .gitignore                       |    7 +++-
 cgit-0.8.2.1-CVE-2010-2542.patch |   12 --------
 cgit.spec                        |   56 ++++++++++++++++++++++++++-----------
 cgitrc                           |   27 ++++++++++++++++--
 sources                          |    4 +-
 5 files changed, 70 insertions(+), 36 deletions(-)
---