tree 8b6bc56c5923fca2958db1352a11c422379d3a8b
parent 4c06a0f9ca9790f9dc68dfc6d5d2d2e6bf36241f
parent 04c592712f80fef50b03dec7aa5135943df3e740
author Jim Schaad <ietf@augustcellars.com> 1471552749 -0700
committer Jim Schaad <ietf@augustcellars.com> 1471552749 -0700

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

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