[proftpd/f13/master: 6/6] Merge branch 'master' into f13

[Paul Howarth]

commit f89897f15b5821b2e81a9595ff597d0cbb77c319
Merge: f10cfda a586c73
Author: Paul Howarth <paul at city-fan.org>
Date:   Fri Sep 10 10:59:27 2010 +0100

    Merge branch 'master' into f13

 .gitignore   |    4 ++--
 proftpd.spec |    9 ++++++++-
 sources      |    2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)
---