Merge branch 'swillner-master'

.travis.yml

README.md

config.mk

man/Makefile

man/feh.pre

src/feh.h

src/filelist.c

src/help.raw

src/main.c

src/options.c

src/options.h

src/thumbnail.c

src/winwidget.c

src/winwidget.h