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

[corsepiu]

commit f8890ed8a7ff827dd22db6dfdbaa4956e170ff04
Merge: c3e1743 aca08d4
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date:   Thu Jul 3 10:18:51 2014 +0200

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

 .gitignore                                         |    2 +-
 ...2-Wait-infinitely-if-max_wait-is-negative.patch |   78 --------------------
 perl-Test-TCP.spec                                 |   11 ++-
 sources                                            |    2 +-
 4 files changed, 8 insertions(+), 85 deletions(-)
---