Merge commit '210881110d3e22cca36edeaca118b5e22c998266'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 18 Jan 2014 20:13:36 +0000 (21:13 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 18 Jan 2014 20:13:36 +0000 (21:13 +0100)
commit06637c92952ce364dbb5add84b7643ed3fc25cac
tree64810d22b141ee2537e6e0ac34a5b0b1aa7308b4
parent3dd04cbcf76b2fe07726c350a5c52270fb9da327
parent210881110d3e22cca36edeaca118b5e22c998266
Merge commit '210881110d3e22cca36edeaca118b5e22c998266'

* commit '210881110d3e22cca36edeaca118b5e22c998266':
  Prepare for 10_alpha2 Release

Conflicts:
RELEASE

Not merged

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