Merge branch 'http' of ssh://drop.maemo.org/git/mdictionary into http
authorJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Mon, 4 Oct 2010 12:35:30 +0000 (14:35 +0200)
committerJakub Jaszczynski <j.j.jaszczynski@gmail.com>
Mon, 4 Oct 2010 12:35:30 +0000 (14:35 +0200)

Trivial merge