Merge commit '82a3e469c6584e6d9e56a3fc38eb001d0650defa' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Mar 2014 03:02:57 +0000 (04:02 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Mar 2014 03:02:57 +0000 (04:02 +0100)
commit251331491299ae89732203edc16d9b6a06f2bd79
treea9945e76f9d9191fb430bb1f26895e99dd01c1ad
parente727cbf0be206e4fe48776735c44b9cdfa96b332
parent82a3e469c6584e6d9e56a3fc38eb001d0650defa
Merge commit '82a3e469c6584e6d9e56a3fc38eb001d0650defa' into release/2.2

* commit '82a3e469c6584e6d9e56a3fc38eb001d0650defa':
  http: Improve options descriptions

Conflicts:
doc/protocols.texi
libavformat/http.c

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