Merge branch 'master' of https://github.com/kmcdonell/pcp into kenj-merge
commitadef9b57c9c8ecd21c75491ad8c4600f874e19d9
authorNathan Scott <nathans@redhat.com>
Wed, 19 Jul 2017 00:52:06 +0000 (19 10:52 +1000)
committerNathan Scott <nathans@redhat.com>
Wed, 19 Jul 2017 00:52:06 +0000 (19 10:52 +1000)
treeec27ccb7a2c42d98b7c2321f7fed1d56b63c0234
parentefbfd7d3494a8789330f17662bf1bffd08a3c852
parentfa2519113269d2837239ba48aa7bbdfac7a2d1e5
Merge branch 'master' of https://github.com/kmcdonell/pcp into kenj-merge
src/include/pcp/impl.h
src/libpcp/src/pmns.c