Merge branch 'master' of git://git.pcp.io/kenj/pcp into kenj-merge
commit77ebf7dd3194da0ad970d4b74d6504cbaa059b0b
authorNathan Scott <nathans@redhat.com>
Fri, 2 Dec 2016 04:29:34 +0000 (2 15:29 +1100)
committerNathan Scott <nathans@redhat.com>
Fri, 2 Dec 2016 04:29:34 +0000 (2 15:29 +1100)
treed04c2ac4abf351a63576e3d287975bba9034d75e
parent090c76aebee2f12584de36eaf5643e599814d51b
parent678234ed8f601230137d70da0bc59b90cd455b3e
Merge branch 'master' of git://git.pcp.io/kenj/pcp into kenj-merge