Merge branch 'master' of https://vcs.maemo.org/git/livewp
authorVlad <vlad@gas.by>
Mon, 5 Jul 2010 08:58:38 +0000 (11:58 +0300)
committerVlad <vlad@gas.by>
Mon, 5 Jul 2010 08:58:38 +0000 (11:58 +0300)
commitd4210b78ea0411dae7ceb04944f0885ae1e48e3b
treef4224cffdc3a93e30c321dfe4718f246dca9f1b3
parent169bdefa2bee6ac3e1db504fe5ca04b5292167f1
parent7a3bc9acc685a8869f4b56fe8e9bf183fcd9f713
Merge branch 'master' of https://vcs.maemo.org/git/livewp

Conflicts:
applet/po/ru_RU.po
applet/po/ru_RU.po