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)
commita39afb26aa1b8625bad5fe7886e4e1c396fa4fb9
treea62329b4e0d383b502b343a1370fd848cc7fa8cb
parentac57e408a342cba99233d0dc515a5b95bea65990
parent83ee9ae54bfe227cff2dc17204224d2e845f8a06
Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws