Merge branch 'weather'
authorAndriy Grytsenko <andrej@rep.kiev.ua>
Sat, 15 Feb 2014 15:34:36 +0000 (17:34 +0200)
committerAndriy Grytsenko <andrej@rep.kiev.ua>
Sat, 15 Feb 2014 15:34:36 +0000 (17:34 +0200)
commit6d51da942e85e3f59ba0ae32fc07ebb5c9fa638c
tree160670a4bca2b3a5e8bd80a053623f2fe424e601
parent4da53742e81bcc2395861433344929b0d4ad73fd
parent6ae6e2d6e94b06cbdf920bc0ad601d17340c9106
Merge branch 'weather'

Conflicts:
configure.ac
configure.ac
po/lxpanel.pot
po/pl.po