Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary
authorMateusz Półrola <mateusz.polrola@comarch.pl>
Wed, 8 Sep 2010 12:36:26 +0000 (14:36 +0200)
committerMateusz Półrola <mateusz.polrola@comarch.pl>
Wed, 8 Sep 2010 12:36:26 +0000 (14:36 +0200)
commite96646d3279ffc86f11cc436dc1d67324ef1286f
tree2d1526419eab299e816a53cb4de9fa2a252f1b44
parent3e1d2590ac16c7d84dea4c0a89c906d8a4e45e65
parentee90723882d91c2958ae001992535dc4a1802a9c
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary

Conflicts:
data/xsl/style.css
data/xsl/style.css