[spamassassin/f16: 3/3] Merge remote-tracking branch 'origin/master' into f16

[Kevin Fenzi]

commit 978643ed7bd343d0c1c140ae6536f389bfea9af4
Merge: e7e0ea3 503b45e
Author: Kevin Fenzi <kevin at scrye.com>
Date:   Thu Jan 19 13:31:27 2012 -0700

    Merge remote-tracking branch 'origin/master' into f16

 spamassassin.service |    2 +-
 spamassassin.spec    |    8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)
---