Git commit aeee59b660e5d1caef77556d151c8aed26a8e433 by Dan Vr=C3=A1til.
Committed on 30/09/2013 at 16:17.
Pushed by dvratil into branch 'parttable-optimization'.

Merge branch 'master' into parttable-optimization

Conflicts:
	server/src/main.cpp

M  +4    -2    server/src/handler/store.cpp
M  +2    -3    server/src/main.cpp

http://commits.kde.org/akonadi/aeee59b660e5d1caef77556d151c8aed26a8e433