sync

git-svn-id: http://svn.miranda-ng.org/main/trunk@7674 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
sync

git-svn-id: http://svn.miranda-ng.org/main/trunk@7675 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c