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

[Robert Scheck]

commit ad757465956d9510a042f1d2de190194c1e76327
Merge: c9f7efd c36f973
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Wed May 21 22:56:46 2014 +0200

    Merge remote branch 'origin/master' into el6

 .gitignore                           |    3 +--
 mimedefang-2.74-perl_prototype.patch |   15 ---------------
 mimedefang.spec                      |    7 ++++---
 sources                              |    2 +-
 4 files changed, 6 insertions(+), 21 deletions(-)
---