[mimedefang/el5: 4/4] Merge remote branch 'origin/master' into el5

[Robert Scheck]

commit 4ee47bac1e29ef13072671ec06a2bd0cc2cacd58
Merge: 42f9ea4 0530438
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Mon Jan 23 23:26:03 2012 +0100

    Merge remote branch 'origin/master' into el5

 .gitignore      |    3 +--
 README.FEDORA   |   30 +++++++++++++++++++++++++++++-
 mimedefang.spec |   15 ++++++++++++---
 sources         |    2 +-
 4 files changed, 43 insertions(+), 7 deletions(-)
---