Merge commit 'a435ca5b4d9efebf0759220681010977c36615f7'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 11 Aug 2013 09:28:50 +0000 (11:28 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 11 Aug 2013 09:28:54 +0000 (11:28 +0200)
* commit 'a435ca5b4d9efebf0759220681010977c36615f7':
  doc: Explain that the default RTMP user agent is different when publishing

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

Simple merge