Merge branch 'master' of git://git.pcp.io/kenj/pcp into kenj-merge
commita0c650c56632880053a71f405a66b6974e89c289
authorNathan Scott <nathans@redhat.com>
Thu, 25 Feb 2016 23:53:40 +0000 (26 10:53 +1100)
committerNathan Scott <nathans@redhat.com>
Thu, 25 Feb 2016 23:53:40 +0000 (26 10:53 +1100)
treef3d3addf96e04b7928f7dec3a5134c30a8ff6215
parentfb15c711ed40942f8e3eddfc81297eabf668b2a1
parentb365e2670530605023219f300c9f28523db901a5
Merge branch 'master' of git://git.pcp.io/kenj/pcp into kenj-merge