Merge commit 'aa16a6b0c56e3f46c5d7efb706b87a8f7a1603ec'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 11 Aug 2013 09:24:09 +0000 (11:24 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 11 Aug 2013 09:24:14 +0000 (11:24 +0200)
commit78242e431028de946cdd5c17dfbf95b0f187e507
tree3dd9230b67ca0232bbbb34858c5c7c459a0e628a
parent6c7a05352f5e941a5cfb371d9b8c9a414194dbef
parentaa16a6b0c56e3f46c5d7efb706b87a8f7a1603ec
Merge commit 'aa16a6b0c56e3f46c5d7efb706b87a8f7a1603ec'

* commit 'aa16a6b0c56e3f46c5d7efb706b87a8f7a1603ec':
  doc: Extend the rtmp example to include how to pass username/password

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