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

[Michael Schwendt]

commit 623afd4b8e039db5653957efc9106673321acb69
Merge: a0c1613 55a33b2
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Sun Jan 1 16:44:28 2012 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

 .gitignore                                       |    2 +-
 claws-mail-extra-plugins-3.7.6-libnotify07.patch |   25 --
 claws-mail-plugins.spec                          |  504 ++++++++++++++--------
 sources                                          |    2 +-
 4 files changed, 335 insertions(+), 198 deletions(-)
---