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

[Todd Zullinger]

commit ab4f1dc81c715cbc48e813c84e7cd434f9661811
Merge: 309b167 637b845
Author: Todd Zullinger <tmz at pobox.com>
Date:   Mon Sep 27 18:20:31 2010 -0400

    Merge branch 'master' into f13

 cgit-0.8.2.1-CVE-2010-2542.patch |   12 ++++++++++++
 cgit.spec                        |    8 +++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---