Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws
authorColin Leroy <colin@colino.net>
Fri, 3 May 2013 10:58:22 +0000 (12:58 +0200)
committerColin Leroy <colin@colino.net>
Fri, 3 May 2013 10:58:22 +0000 (12:58 +0200)

Trivial merge