Merge branch 'qml' of ssh://drop.maemo.org/git/mdictionary into qml
authorMarcin Kaźmierczak <marcin@marcin-desktop.(none)>
Tue, 18 Jan 2011 15:12:42 +0000 (16:12 +0100)
committerMarcin Kaźmierczak <marcin@marcin-desktop.(none)>
Tue, 18 Jan 2011 15:12:42 +0000 (16:12 +0100)
commit94e25431e7f7a0fa6e5c07ad6e761a1c12fec346
tree2c4699cea87297695d69fb783a588a05951390e4
parent81211b66843c093170d0ea7b00aae3e3ecb3db9c
parentc1242780cf8f2455d694478bdf5ae8e03d714653
Merge branch 'qml' of ssh://drop.maemo.org/git/mdictionary into qml