Merge commit '8ae0d702a1ba1c3c8d88a29c181f8434f25bf53c' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Mar 2015 12:28:40 +0000 (13:28 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Mar 2015 12:28:40 +0000 (13:28 +0100)
commit1177e047f1661d902fa2f6db32218199f41fdd89
tree55d5c77d89df24c85766cf7ac82c3c2b71f9b30e
parent66342aab73168f590ff32e343d4c1a4a1c9a0025
parent8ae0d702a1ba1c3c8d88a29c181f8434f25bf53c
Merge commit '8ae0d702a1ba1c3c8d88a29c181f8434f25bf53c' into release/2.2

* commit '8ae0d702a1ba1c3c8d88a29c181f8434f25bf53c':
  doc: More changelog updates for v10.6

Conflicts:
Changelog

not merged

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