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

[Michael Schwendt]

commit e2ce22a9c62f20edbd4ac0768f023cc27b64dcfd
Merge: 16303c5 edf816e
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Sun Jan 22 02:19:28 2012 +0100

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

 claws-mail.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---