[perl-Parallel-Prefork/f19: 4/4] Merge remote-tracking branch 'origin/f20' into f19

[corsepiu]

commit 31a9666c865cd72666d2d754c4b71d9ff98aa64b
Merge: 0e0d4b5 b43e44d
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date:   Mon Jul 14 12:25:37 2014 +0200

    Merge remote-tracking branch 'origin/f20' into f19

 .gitignore                 |    2 +-
 perl-Parallel-Prefork.spec |    5 ++++-
 sources                    |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)
---