Merge commit '76435f5e40854567252756ea7f788958dd2cc04c' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Mar 2015 22:09:55 +0000 (23:09 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Mar 2015 22:09:55 +0000 (23:09 +0100)
commit9575bd6a9d4c9527f09e3d906b338d6c184bafce
treeed8ddb70bb9c3bfd5363758bd4c2a4e25646b96e
parent90afa95a55a26bd407604e279f3bb551201ed6d7
parent76435f5e40854567252756ea7f788958dd2cc04c
Merge commit '76435f5e40854567252756ea7f788958dd2cc04c' into release/0.10

* commit '76435f5e40854567252756ea7f788958dd2cc04c':
  doc: More changelog updates for v0.8.17

Conflicts:
Changelog

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