[mingw-ftplib/f17: 3/3] Merge branch 'master' into f17

[epienbro]

commit 5ceb8d3bfdbf997210049192d3e544b0e841e0d4
Merge: ab09b12 5f13532
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Mon Feb 27 20:51:46 2012 +0100

    Merge branch 'master' into f17

 mingw-ftplib.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---