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

[Michael Schwendt]

commit 70cc569d9bcb4216c8210d40c235e58d7e1ceae0
Merge: 5d6ccd8 d501a58
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Tue Dec 13 00:37:04 2011 +0100

    Merge branch 'master' into f15

 claws-mail-plugins.spec |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
---