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

[Michael Schwendt]

commit 45d2f85b294f23e75ff039488cb0084571a081b5
Merge: 70cc569 58077ae
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Thu Dec 15 19:55:07 2011 +0100

    Merge branch 'master' into f15

 claws-mail-plugins.spec                     |   13 ++++++++++++-
 vcalendar-2.0.11cvs11-procmsg-no-lock.patch |   24 ++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletions(-)
---