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

[Andreas Bierfert]

commit a0c16130322a1afc5912b066f126d440c3c3e3c1
Merge: 5d36ec4 1bc23a7
Author: Andreas Bierfert <andreas.bierfert at lowlatency.de>
Date:   Mon Jan 24 22:03:42 2011 +0100

    Merge branch 'master' into el6

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