Merge commit 'aace8b184c867875e2715b2af23fa98886f90427' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Mar 2015 21:39:24 +0000 (22:39 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Mar 2015 21:39:24 +0000 (22:39 +0100)
* commit 'aace8b184c867875e2715b2af23fa98886f90427':
  Prepare for 0.8.17 Release

Conflicts:
RELEASE

not merged

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

Trivial merge