Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 18 Dec 2013 18:54:04 +0000 (19:54 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 18 Dec 2013 18:54:04 +0000 (19:54 +0100)
commit03a5c44faeceaf058ffe43c14d7d1a0d7c12da4c
treee4abf4ca4d7b691dbe8928cdaf343f78532a87e9
parentd8b4ba3c5a9cff9fdd36b03d600ad38e09608daf
parentfe533ffdcffadb3e55f07d0caf316bc6bfe82049
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Prepare release notes for Libav 10 "Eks"

Conflicts:
doc/RELEASE_NOTES

Not merged because all that stuff has been in past releases

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