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

[Andreas Bierfert]

commit 5d36ec401d3891ea9f9bd8628fe716e8b9c750de
Merge: 06d9b2b 269aa88
Author: Andreas Bierfert <andreas.bierfert at lowlatency.de>
Date:   Mon Jan 24 17:28:29 2011 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	claws-mail-plugins.spec
    	sources

 .gitignore                                       |    2 +-
 claws-mail-extra-plugins-3.7.6-libnotify07.patch |   25 +++
 claws-mail-plugins.spec                          |  218 +++++++++++++++-------
 sources                                          |    2 +-
 4 files changed, 174 insertions(+), 73 deletions(-)
---
diff --cc .gitignore
index 4a53a46,ee8cd41..085c0fb
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--claws-mail-extra-plugins-3.7.6.tar.bz2
+ /claws-mail-extra-plugins-3.7.8.tar.bz2