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

[Michael Schwendt]

commit 82427f073d8661d245673f5bf63d9e521a210ca0
Merge: eb3c7a5 813449a
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Sun Jan 1 16:40:23 2012 +0100

    Merge branch 'master' into el6

 .gitignore         |    7 ++
 claws-mail.desktop |    9 --
 claws-mail.spec    |  279 ++++++++++++++++++++++++++++++++++------------------
 sources            |    2 +-
 4 files changed, 192 insertions(+), 105 deletions(-)
---
diff --cc .gitignore
index 20be101,296eba3..10fa06e
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,9 +1,8 @@@
 -claws-mail-3.7.6.tar.bz2
  /claws-mail-3.7.8.tar.bz2
+ /claws-mail-20110329cvs.tar.bz
+ /claws-mail-20110329cvs.tar.bz2
+ /claws-mail-20110403cvs.tar.bz2
+ /claws-mail-20110409cvs.tar.bz2
+ /claws-mail-3.7.9.tar.bz2
+ /claws-mail-3.7.10.tar.bz2
+ /claws-mail-3.8.0.tar.bz2