Merge commit '052b97855de2396e46682bcbae97f95a258816d4'
authorClément Bœsch <u@pkh.me>
Fri, 24 Mar 2017 12:07:50 +0000 (13:07 +0100)
committerClément Bœsch <u@pkh.me>
Fri, 24 Mar 2017 12:07:50 +0000 (13:07 +0100)
commitd1ab8c66cf4745abe11f59236f8dc1308826bf95
tree68848aa57adc87a3328fa914b414d4e7fbe78d15
parent99c9e00c685d4fb9e991b8b24aa4818c19173cff
parent052b97855de2396e46682bcbae97f95a258816d4
Merge commit '052b97855de2396e46682bcbae97f95a258816d4'

* commit '052b97855de2396e46682bcbae97f95a258816d4':
  aviocat: Support avio options

Merged-by: Clément Bœsch <u@pkh.me>
tools/aviocat.c