[perl-Test-SharedFork/f20: 2/2] Merge remote-tracking branch 'origin/master' into f20

[corsepiu]

commit 7cf4bd155bb7aaa0de806c9282e10aac4a9421de
Merge: 80a7a88 4d6c3f1
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date:   Mon Jul 7 08:50:08 2014 +0200

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

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