[amavisd-new/el6: 5/5] Merge remote branch 'origin/master' into el6

[Robert Scheck]

commit a9e6ff24bc138d4e312bc76080552d004b04201c
Merge: f79ab9a 30edeb1
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Mon Dec 2 16:30:56 2013 +0100

    Merge remote branch 'origin/master' into el6

 amavisd-conf.patch                   |   14 +++++++++++++-
 amavisd-new-2.8.0-init_network.patch |   13 +++++++++++++
 amavisd-new.spec                     |   21 ++++++++++++++++++++-
 3 files changed, 46 insertions(+), 2 deletions(-)
---