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

[corsepiu]

commit 3892859b3112e9bdea5e29bbe8c99f90fd48a463
Merge: 9bb7dd2 60625cb
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date:   Thu Nov 8 03:44:50 2012 +0100

    Merge remote-tracking branch 'origin/f18' into f17

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