From: Piotrek <ppilar11@gmail.com>
Date: Wed, 18 Aug 2010 09:46:16 +0000 (+0200)
Subject: Merge branch 'cache' of ssh://drop.maemo.org/git/mdictionary into cache
X-Git-Tag: 0.4~20^2~10^2
X-Git-Url: https://vcs.maemo.org/git/?a=commitdiff_plain;h=b1988963f4d13e851867c0673dcab23fca54b12f;p=mdictionary

Merge branch 'cache' of ssh://drop.maemo.org/git/mdictionary into cache

Conflicts:
	trunk/src/plugins/xdxf/tests/test.cpp
---

b1988963f4d13e851867c0673dcab23fca54b12f