Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws
authorColin Leroy <colin@colino.net>
Fri, 30 May 2014 12:37:10 +0000 (14:37 +0200)
committerColin Leroy <colin@colino.net>
Fri, 30 May 2014 12:37:10 +0000 (14:37 +0200)
commite439c5a1e30df44cb395a3334f8fc3a0b2334f69
tree8e430dbe375ed6a08cb3724c10b98f4482e958d0
parent9326abda1cf649e65cee4abcd988a8f1c5a5624b
parentfc3b76265d5a375b8931db4f3f02b1d989928407
Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws