Merge commit '60a1ee6e419e244dc2363fdc4ddf8350d506f2ae' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 7 Apr 2013 12:43:37 +0000 (14:43 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 7 Apr 2013 12:43:37 +0000 (14:43 +0200)
commit9285f25e31a73900148b6fe6643ed82b055619cb
treed6ed9d79d39d9070866d5f34aeb967260ddcb309
parent1aa50348d8bc74fad59bca4f2c52b05ac0f92a60
parent60a1ee6e419e244dc2363fdc4ddf8350d506f2ae
Merge commit '60a1ee6e419e244dc2363fdc4ddf8350d506f2ae' into release/0.10

* commit '60a1ee6e419e244dc2363fdc4ddf8350d506f2ae':
  doc: Fix some obsolete references to av* tools as ff* tools

Conflicts:
doc/indevs.texi

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