Merge branch 'master' of git://git.pcp.io/kenj/pcp into kenj-merge
commitf9842db4a27c0a69efa6a97b656d5525539044f3
authorNathan Scott <nathans@redhat.com>
Mon, 14 Dec 2015 04:27:36 +0000 (14 15:27 +1100)
committerNathan Scott <nathans@redhat.com>
Mon, 14 Dec 2015 04:27:36 +0000 (14 15:27 +1100)
treee9080bd605a75b271e5974eaa17201476ca17f94
parent66d57a2bec3b14d1823855d9ea025a67fe77d0f1
parenta80b9e8026d58111a2ad5215cb84130176245cb5
Merge branch 'master' of git://git.pcp.io/kenj/pcp into kenj-merge