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

Thu Dec 29 20:31:31 UTC 2011

commit 6d6e56516700df606f2ded400f638c1482ee02b2
Merge: 45d2f85 55a33b2
Author: Andreas Bierfert <andreas.bierfert at lowlatency.de>
Date:   Thu Dec 29 21:31:15 2011 +0100

    Merge branch 'master' into f15

 .gitignore                                         |    8 +--
 ...s-mail-extra-plugins-3.7.10-glib2-include.patch |   31 ------
 claws-mail-plugins.spec                            |  104 +++++++++-----------
 sources                                            |    5 +-
 vcalendar-2.0.11cvs11-procmsg-no-lock.patch        |   24 -----
 5 files changed, 48 insertions(+), 124 deletions(-)
---