Merge branch 'master' of git://git.pcp.io/kenj/pcp into kenj-merge
commit28aaac5590cae4eacaef6b5446172497d0365b4c
authorNathan Scott <nathans@redhat.com>
Thu, 12 May 2016 02:25:56 +0000 (12 12:25 +1000)
committerNathan Scott <nathans@redhat.com>
Thu, 12 May 2016 02:25:56 +0000 (12 12:25 +1000)
treefff27a6b2feb81e11c001e5368bbfba3189baff1
parenta06f1acaf010b900264e87c3c26a77d843b50e8f
parentb1bfdd50030e7c57d0a6fe1202d91837cc5628f6
Merge branch 'master' of git://git.pcp.io/kenj/pcp into kenj-merge