Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws
authorwwp <wwp@free.fr>
Mon, 28 Apr 2014 08:27:44 +0000 (10:27 +0200)
committerwwp <wwp@free.fr>
Mon, 28 Apr 2014 08:27:44 +0000 (10:27 +0200)
commit8704da39f60cf3ac2d15506ee539c0f79e60ef50
tree74f54365524ccd304c980c0cd1feb00acd9baa62
parent0ad67b156700fdb53f6912d52adceb79389e6683
parent2c8ed95f7080187c10adb816d4d5d60fcd355fd4
Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws