• Lubos Slovak's avatar
    Merge branch 'master' into public-libs · 501e50b8
    Lubos Slovak authored
    Conflicts:
    	src/common/namedb/namedb.h
    	src/common/namedb/namedb_trie.c
    	src/libknot/descriptor.c
    	src/libknot/packet/rrset-wire.c
    	src/libknot/processing/requestor.c
    	src/libknot/rrtype/aaaa.h
    501e50b8