Merge commit '48d1ed9c83ee0c388e8c2898e81ffb4add509ab9'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Feb 2014 21:19:41 +0000 (22:19 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Feb 2014 21:19:41 +0000 (22:19 +0100)
commit26dad980baaa6858561b3269d375c1d9223f579c
tree0607c7efcc3799b9f4ffe9f7f6c4b3844d691cc9
parent6b06f9f1bc4c51a96186021bf0f99599e49aff47
parent48d1ed9c83ee0c388e8c2898e81ffb4add509ab9
Merge commit '48d1ed9c83ee0c388e8c2898e81ffb4add509ab9'

* commit '48d1ed9c83ee0c388e8c2898e81ffb4add509ab9':
  doc: name correct header

Conflicts:
doc/APIchanges

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