Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws
authorwwp <wwp@free.fr>
Fri, 31 Oct 2014 10:17:29 +0000 (11:17 +0100)
committerwwp <wwp@free.fr>
Fri, 31 Oct 2014 10:17:29 +0000 (11:17 +0100)
commit1f531cb572b3d826995bba47b7cf9a65042d9d78
tree4672d84f37c0dc5f57626fe621c227dd63350895
parentb31596fbc276d86b67fc676e3f859cd513d8b4fe
parent64f523e4ab992a1f515294dd906d8aae15277235
Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws