Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary into xdxf
authorBartosz Szatkowski <bulislaw@linux.com>
Mon, 9 Aug 2010 06:16:36 +0000 (08:16 +0200)
committerBartosz Szatkowski <bulislaw@linux.com>
Mon, 9 Aug 2010 06:16:36 +0000 (08:16 +0200)
commit5c7043238021a7ef64edf6b19b7d91545ceb337f
tree1bb004cd8aec99e9d663daa4d56665c259b4db3b
parent06b24a3ee6ef30c20f8b484f54de4181ed9e79f7
parent904be546374d0a98f67a46701e356fa7979841ea
Merge branch 'master' of ssh://drop.maemo.org/git/mdictionary into xdxf