Merge commit 'a014b9614e6165fb8df9e756f46a95d516794678' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 10 Apr 2014 02:35:35 +0000 (04:35 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 10 Apr 2014 02:35:35 +0000 (04:35 +0200)
* commit 'a014b9614e6165fb8df9e756f46a95d516794678':
  Prepare for 10.1 Release

Conflicts:
RELEASE

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

Trivial merge