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

[Robert Scheck]

commit 7e745efd65793eadbe748388b786b15cffe25078
Merge: a5f1ece 81947c5
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sat Oct 8 21:08:08 2011 +0200

    Merge remote branch 'origin/master' into el5

 .gitignore      |    1 +
 mimedefang.spec |    8 +++++++-
 sources         |    2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)
---