diff options
author | George Hazan <george.hazan@gmail.com> | 2012-08-05 21:44:11 +0000 |
---|---|---|
committer | George Hazan <george.hazan@gmail.com> | 2012-08-05 21:44:11 +0000 |
commit | 33e1601b384a006d514698ba61c93afc23043c52 (patch) | |
tree | 68626dbd69cdc557400bb8e47e4d6309faea4b8a /protocols/Weather | |
parent | a153409965bb3583a1d5b050eef14ed8d7d0543a (diff) |
incorrect merge
git-svn-id: http://svn.miranda-ng.org/main/trunk@1372 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/Weather')
0 files changed, 0 insertions, 0 deletions