Merge commit '6ca11f7157d0ffd11ea9a4211b04981b46dc75d6'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 25 Aug 2014 10:09:29 +0000 (12:09 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 25 Aug 2014 10:09:29 +0000 (12:09 +0200)
commitf1b04f803eafa17dbfa19977b1a76f412183478e
treede048785399523e5004fff4b517ed9394e794e43
parenta2841d92c384e345cbbeffab72406405a0d9410c
parent6ca11f7157d0ffd11ea9a4211b04981b46dc75d6
Merge commit '6ca11f7157d0ffd11ea9a4211b04981b46dc75d6'

* commit '6ca11f7157d0ffd11ea9a4211b04981b46dc75d6':
  doc/APIchanges: fill in missing hashes and dates

Conflicts:
doc/APIchanges

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