Merge branch 'master' of https://vcs.maemo.org/git/livewp
authorvlad <vlad@vlanout.(none)>
Mon, 23 Aug 2010 04:07:29 +0000 (07:07 +0300)
committervlad <vlad@vlanout.(none)>
Mon, 23 Aug 2010 04:07:29 +0000 (07:07 +0300)
commit6140b2c93aff8ade097deb5a3d632ac591bdb996
tree5ab04e29cdd92c222ea5d3076c565402cb8622be
parent8eaf547564325312c22a65f1e3788f74bf4c318b
parent4606187dfdd5a2cb1fc92aebd5499ef5550944d5
Merge branch 'master' of https://vcs.maemo.org/git/livewp

Conflicts:
applet/debian/changelog
applet/po/es_ES.po
applet/po/es_MX.po
applet/po/fi_FI.po
applet/po/pl_PL.po
applet/po/ru_RU.po
applet/src/livewp-settings.c
applet/debian/changelog
applet/po/es_ES.po
applet/po/es_MX.po
applet/po/fi_FI.po
applet/po/pl_PL.po
applet/po/ru_RU.po
applet/src/livewp-settings.c