Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws
authorColin Leroy <colin@colino.net>
Tue, 23 Apr 2013 06:39:57 +0000 (08:39 +0200)
committerColin Leroy <colin@colino.net>
Tue, 23 Apr 2013 06:39:57 +0000 (08:39 +0200)

Trivial merge