Merge branch 'master' into rule_based_answering

.gitignore

Knot.files

libtap/Makefile.am

src/Makefile.am

src/common/base32hex.c

src/common/base64.c

src/common/descriptor.c

src/common/errcode.c

src/common/errors.c

src/common/evsched.c

src/common/fdset.c

src/common/fdset.h

src/common/getline.c

src/common/hattrie/hat-trie.c

src/common/hattrie/murmurhash3.c

src/common/heap.c

src/common/hex.c

src/common/hhash.c

src/common/lists.c

src/common/log.c