Merge branch 'master' into extension-structured-reply
authorEric Blake <eblake@redhat.com>
Thu, 26 Oct 2017 06:13:49 +0000 (08:13 +0200)
committerEric Blake <eblake@redhat.com>
Thu, 26 Oct 2017 06:14:41 +0000 (08:14 +0200)
commitd37f6a93c5377ffa3db172ba5ab4a27c04c13180
tree1928b7ab6d456ea8581c63ed49de77169d51634e
parent1593d0b1648c373a5adb7c21300324382c144f20
parent3c610bde4676489084c76191d89eb63dae05e44f
Merge branch 'master' into extension-structured-reply
doc/proto.md