Merge commit 'd9792b773516a560ecb99694b8ee745a50027fac'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 4 Sep 2014 18:50:01 +0000 (20:50 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 4 Sep 2014 18:50:01 +0000 (20:50 +0200)
commit53b089200557b299174bec72415b166ad43083a6
treebfcb2f8ea991bdc2221e43c9e7488f8f991daaa4
parent69a68d301345a89a27479f2a6093fc4624804049
parentd9792b773516a560ecb99694b8ee745a50027fac
Merge commit 'd9792b773516a560ecb99694b8ee745a50027fac'

* commit 'd9792b773516a560ecb99694b8ee745a50027fac':
  Mark 11 release in the changelog

Conflicts:
Changelog

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