[proftpd/f15/master: 3/3] Merge branch 'master' of ssh://pkgs.fedoraproject.org/proftpd

[Paul Howarth]

commit a0b08226a76b97b316359e1723e8946313d4acfc
Merge: 469280b 05ba557
Author: Paul Howarth <paul at city-fan.org>
Date:   Fri Feb 11 09:51:41 2011 +0000

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/proftpd

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