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

[Todd Zullinger]

commit 09b2becf60a0265d15f271bd136a69e35dfc93cd
Merge: 0160617 637b845
Author: Todd Zullinger <tmz at pobox.com>
Date:   Mon Sep 27 18:20:41 2010 -0400

    Merge branch 'master' into f12

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