Merge commit 'fb9a5bdc516b75b4ba1e36ca2223dec46571dea3'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Mar 2014 20:01:14 +0000 (21:01 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Mar 2014 20:01:14 +0000 (21:01 +0100)
commita47dfdfa7dcfe952b65140de6dccf849a103cc8e
tree8f55b7f20d3873980534afd687fa9a922ea32599
parent8b02dfd37cb3bc9521fc6e1f5b5f13c80d144cd2
parentfb9a5bdc516b75b4ba1e36ca2223dec46571dea3
Merge commit 'fb9a5bdc516b75b4ba1e36ca2223dec46571dea3'

* commit 'fb9a5bdc516b75b4ba1e36ca2223dec46571dea3':
  Prepare for 11_alpha1 Release

Conflicts:
RELEASE

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