git hashes are valid in the kolab/integration/1.12.0 branch from git clone https://git.kolab.org/diffusion/A/akonadi.git

notes from randa:

do not push to upstream:

• b5ff5bf6a117cf3d59708622bc01784b1f632a69 Revert "QueryBuilder:etForwardOnly: use ForwardOnly mode for sql query"
• ea6e2a24c97b8e0f5f6b8350aabe749e9203dfc7 Remove old revision after new part is committed.
• 723b1f8c5ee4fdb389f7044d428094b32c6f6f45 Disabled akappendhandlertest on windows
• ec2f31de77414f981644623edf91616088304af7 Prepare 1.12.42.2 release
• ef276552d8c957be8cffb35a7f142a62a5b27994 Revert "Ignore the custom settings in ~/.my.cnf"

to 15.08:
+ 4b40de1bbde8e11943d7fcb6a16c399c45a98a54 Always accept notifications for the parent resource
-> done already

master:
+ 5cebc7f09f25d9c24cbfaca2484db9ad31d866a6 Don't block a command while retrieving parts if we can afford it.

+ b33204e8fedb1a72c5d9e6628ace69a40601affc LIST: list referenced/enabled status of ancestors.

• Port to new protocol

+ 396f84844d6da1d62221c3a8e8ed9c1c52c7138f Return mimetype with relation
*Get mimetype id as part of relationquery. Lookup mimetype name in local cache. Port to new protocol.

+ 955b8da219df906dbbd2d504fe2c68712ff7da35 Don't limit merging by mimetype.

• Fix assert in ItemCreateJob, to allow no mimetype in case of merge and
• Allow merging for everything except for payloads

+ 9a157373c5d5637a9b851579c0e7681a1f790d87 fsck routine to cleanup rid duplicates

• Turn inform into akDebug. return on exec fail of queries