commit 8079a2f39ea403dcbf091d19386394dabfc94737
Merge: 1fd3b1f b0b1ef1
Author: Paul Howarth <paul at city-fan.org>
Date: Wed Jan 19 21:45:05 2011 +0000
Merge branch 'f14' into el5
.gitignore | 2 +-
proftpd.init | 3 ++-
proftpd.spec | 12 ++++++++++--
sources | 2 +-
4 files changed, 14 insertions(+), 5 deletions(-)
---