[proftpd/el6/master: 13/13] Merge branch 'master' into el6

[Paul Howarth]

commit af2143d9b201a216888cbfe088c09d35aca0902e
Merge: 24eba86 a586c73
Author: Paul Howarth <paul at city-fan.org>
Date:   Fri Sep 10 11:09:27 2010 +0100

    Merge branch 'master' into el6

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