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

[Robert Scheck]

commit 1a82d21d98738d6a3d0336c1469170dcc2398f7b
Merge: b0067a4 81947c5
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sat Oct 8 21:07:47 2011 +0200

    Merge remote branch 'origin/master' into el6

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