Peter Korsgaard 44d2cc99a4 Merge branch 'next' ...

My local 'next' branch was not uptodate, so the previous merge was missing
the most recent changes.

Thanks to François Perrad for noticing.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

2016-12-02 08:53:56 +01:00

..

Config.in

…

jasper.hash

…

jasper.mk

Merge branch 'next'

2016-12-02 08:53:56 +01:00