Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws
authorMichael Rasmussen <mir@datanom.net>
Sun, 8 Jun 2014 15:38:53 +0000 (17:38 +0200)
committerMichael Rasmussen <mir@datanom.net>
Sun, 8 Jun 2014 15:38:53 +0000 (17:38 +0200)
commit442b3bbaea6ed12a79e293cb9af0450b5a2f26d8
tree1a69b343839caf0bf88fd5b9c63b073c8b37df86
parent541a94138c6bc9dc1b9a3abbc9b2d4ef4f38b93f
parent61c0a7f00292ecc66f53021e7e9490f52a885094
Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws