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

[Andreas Bierfert]

commit 066f59cdaed0c3dcf8ab1d790149370897f8f4b2
Merge: 58f103a 1dbd953
Author: Andreas Bierfert <awjb at sirius.a.lan>
Date:   Mon Nov 19 13:10:07 2012 +0100

    Merge branch 'master' into el6

 .gitignore              |    2 +-
 claws-mail-plugins.spec |  105 ++++++++++++++++++++++++++++++++++-------------
 sources                 |    2 +-
 3 files changed, 78 insertions(+), 31 deletions(-)
---