Merge commit '59cc0812207e3c2e2f2e559d60d0a8f9296a8847'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 10 Aug 2014 18:32:00 +0000 (20:32 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 10 Aug 2014 18:32:00 +0000 (20:32 +0200)
commitc24be3c4a2e15e7295bdef8183deb168b6835eb9
tree209d2e7202b7a331db1ba7a1443b75cd2eef2e29
parent3787495e1f2c2e2de333cf452021822c2655c8d0
parent59cc0812207e3c2e2f2e559d60d0a8f9296a8847
Merge commit '59cc0812207e3c2e2f2e559d60d0a8f9296a8847'

* commit '59cc0812207e3c2e2f2e559d60d0a8f9296a8847':
  Prepare for 11_alpha2 Release

Conflicts:
RELEASE

Not merged, as our release numbers differ

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