Merge commit 'dd35d451fbc34795a8d19ac6c281bed53c42a29b'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 18 Aug 2014 17:50:55 +0000 (19:50 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 18 Aug 2014 17:51:40 +0000 (19:51 +0200)
commitf47751a56cc470c90f9761afd510e5a6560340f9
tree3e37302a55eaa27e5ecd51509c5b66efb1e6f8a7
parent79593096c43c13a4524822fceffca7e4647ff67d
parentdd35d451fbc34795a8d19ac6c281bed53c42a29b
Merge commit 'dd35d451fbc34795a8d19ac6c281bed53c42a29b'

* commit 'dd35d451fbc34795a8d19ac6c281bed53c42a29b':
  doc: Change wrong term to avoid confusion

Conflicts:
doc/developer.texi

No change, as the wrong term is not part of our docs

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