tree e5ded6ae9c5dc629d73bbb4a883722d0579f4438
parent 395ce05f402aecd5e519fd4ad18c2801816b4c4d
parent 99273649cc97cbf8c2578d558c3541b63f8d7a66
author Jim Schaad <ietf@augustcellars.com> 1471552342 -0700
committer Jim Schaad <ietf@augustcellars.com> 1471552342 -0700

Merge remote-tracking branch 'refs/remotes/origin/windows2' into complete

# Conflicts:
#	.gitignore
#	include/cn-cbor/cn-cbor.h
#	src/cn-encoder.c