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

[corsepiu]

commit 47a688429307edd6511b4312176ce758e252704b
Merge: c9b1469 1e91965
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date:   Sat Nov 26 07:59:36 2011 +0100

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

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