[perl-Plack-Middleware-Test-StashWarnings/f14: 4/4] Merge.

[corsepiu]

commit aecc8d22b9ccfb441722ec1a0163070b8ba3100c
Merge: 58f4f9d 15c6d31
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date:   Tue Jun 21 15:38:48 2011 +0200

    Merge.

 .gitignore                                    |    2 +-
 perl-Plack-Middleware-Test-StashWarnings.spec |    5 ++++-
 sources                                       |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)
---
diff --cc perl-Plack-Middleware-Test-StashWarnings.spec
index a2ba354,6d57772..d1959f0
--- a/perl-Plack-Middleware-Test-StashWarnings.spec
+++ b/perl-Plack-Middleware-Test-StashWarnings.spec
@@@ -52,5 -52,11 +52,8 @@@ rm -rf $RPM_BUILD_ROO
  %{_mandir}/man3/*
  
  %changelog
+ * Tue Jun 21 2011 Ralf Corsépius <corsepiu at fedoraproject.org> 0.05-1
+ - Upstream update.
+ 
 -* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.04-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 -
  * Wed Dec 22 2010 Ralf Corsépius <corsepiu at fedoraproject.org> 0.04-1
  - Initial Fedora package.