Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws
commit8f65fc9f8be8d30ba67d8f4a64256e8645aa0dc1
authorColin Leroy <colin@colino.net>
Mon, 16 Nov 2015 09:17:24 +0000 (16 10:17 +0100)
committerColin Leroy <colin@colino.net>
Mon, 16 Nov 2015 09:17:24 +0000 (16 10:17 +0100)
tree44862aebeda4834c142bae799fc07eeaaf42d69d
parent2a2a1bd7db0949e1763661b6098b31a6cd82f617
parent0314464dd5c5e4e49f7fb5835e0316726267506e
Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws
src/mainwindow.c