Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary into qml
authorMarcin Kaźmierczak <marcin@marcin-desktop.(none)>
Wed, 16 Feb 2011 15:00:13 +0000 (16:00 +0100)
committerMarcin Kaźmierczak <marcin@marcin-desktop.(none)>
Wed, 16 Feb 2011 15:00:13 +0000 (16:00 +0100)
commit21a14d392f44458d749c76552e971f33625705ea
treeaf787ebda84ca12c36189b515be7d8efe5d6536d
parent06006ec4b141e50fbb2174c6f0673cb0a7962f91
parent4c7aa677b70c8d456a7932de4f545724652587d6
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary into qml