Summary of changes: 0a1f1cd... Rebuild against newer evolution-data-server (*) 496f6c7... Rebuild against newer evolution-data-server (*) 049724c... 4.0.0 (*) 43c0a4e... fix merge (*) (*) This commit already existed in another branch; no separate mail sent