[claws-mail-plugins/el6: 3/3] Merge branch 'master' into el6

[Michael Schwendt]

commit 58f103a779913e8210f11d1a0a1e10d408745159
Merge: 623afd4 0b86d62
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Sun Jan 22 01:49:49 2012 +0100

    Merge branch 'master' into el6

 claws-mail-plugins.spec |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)
---