[perl-CGI-Emulate-PSGI/f14: 4/4] Merge remote-tracking branch 'origin/f15' into f14

[corsepiu]

commit a20dfd29e03b9c99a9beb4accf8b553c2e3eebe5
Merge: b7fe1dd c9b1469
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date:   Mon Sep 19 11:00:14 2011 +0200

    Merge remote-tracking branch 'origin/f15' into f14

 .gitignore                 |    1 +
 perl-CGI-Emulate-PSGI.spec |    6 +++++-
 sources                    |    2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)
---