Merge commit '4c1e4bc6af1596995e895cd7da9f3b436051114c' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 12:24:15 +0000 (14:24 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 12:24:15 +0000 (14:24 +0200)
commit238532700e841dd06cdd2d66f5842227838f73ba
tree6f87f79b763f57e79bf5b47d1976a0ff2720df8d
parented9ab30f4cca55f0306fb91ad79562f1de4d3bb7
parent4c1e4bc6af1596995e895cd7da9f3b436051114c
Merge commit '4c1e4bc6af1596995e895cd7da9f3b436051114c' into release/1.1

* commit '4c1e4bc6af1596995e895cd7da9f3b436051114c':
  Prepare for 9.13 Release

Conflicts:
RELEASE

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