Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws
authorPaul <paul@claws-mail.org>
Mon, 27 Oct 2014 17:21:34 +0000 (17:21 +0000)
committerPaul <paul@claws-mail.org>
Mon, 27 Oct 2014 17:21:34 +0000 (17:21 +0000)
commit80a4bf8386305896d042dcc3763743cd8ae967dc
tree10e8b0b632e684cb94e67101d02ce29d9b828096
parent34f23bba1c219297bf8d60d0487918f23660a18b
parentc19facda6df50d13f7fd4d10b66ac6b00b9ba891
Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws

Conflicts:
po/bg.po
po/bg.po