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

[corsepiu]

commit b7fe1dd159f3dbf40673ff6f1f04b975d297abb2
Merge: 0132bb5 78b66d3
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date:   Mon Jun 20 18:54:53 2011 +0200

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

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