Merge commit '00abc0080d2f5f179f18534713659ce79b22e647' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Mar 2015 10:41:49 +0000 (11:41 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Mar 2015 10:41:49 +0000 (11:41 +0100)
commit6bf31ae3f9295c7df6aac8fdde6c8f9c80723c58
treeee4c36e71dfae08554f576928a27ebd8cd6afe68
parent2f323df8339b804d7577d81ec62152b3544c4ee4
parent00abc0080d2f5f179f18534713659ce79b22e647
Merge commit '00abc0080d2f5f179f18534713659ce79b22e647' into release/2.4

* commit '00abc0080d2f5f179f18534713659ce79b22e647':
  doc: More changelog updates for v11.3

Conflicts:
Changelog

not merged

Merged-by: Michael Niedermayer <michaelni@gmx.at>