tree 35aabb09268eb72d36ce11deea7e88fe4cb7a35b
parent f70ab0e3ad3abdb37462396c8057ac05ea2accff
parent d9390ae279e5e81b6ec79b9b6415d1a839defbbe
author Philip Tricca <philip.b.tricca@intel.com> 1498245607 -0700
committer Philip Tricca <philip.b.tricca@intel.com> 1498245607 -0700

Merge branch '1.x'

Conflicts:
	test/tpmclient/tpmclient.c