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

[Robert Scheck]

commit c9f7efd33020a17a41745eb265a858fb1ca48e70
Merge: 9f0fcc4 ad4805a
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sat Aug 31 20:16:23 2013 +0200

    Merge remote branch 'origin/master' into el6

 .gitignore                           |    1 +
 mimedefang-2.74-perl_prototype.patch |   15 +++++++++++++++
 mimedefang.spec                      |   34 ++++++++++++++++++++++++----------
 sources                              |    2 +-
 4 files changed, 41 insertions(+), 11 deletions(-)
---