-
Jean-Paul Saman authored
(cherry picked from commit d55efb20) Signed-off-by:
Jean-Paul Saman <jpsaman@videolan.org> Conflicts: NEWS
613500a3
(cherry picked from commit d55efb20) Signed-off-by:Jean-Paul Saman <jpsaman@videolan.org> Conflicts: NEWS