Merge branch 'master' of git://git.pcp.io/kenj/pcp into kenj-merge
commit4dec7e5b86262ed03b75fa9b8f6dfda40f0fac68
authorNathan Scott <nathans@redhat.com>
Thu, 10 Dec 2015 05:41:28 +0000 (10 16:41 +1100)
committerNathan Scott <nathans@redhat.com>
Thu, 10 Dec 2015 05:41:28 +0000 (10 16:41 +1100)
tree52a23c41d6ff969f1c8931ce8baf639694ae1e38
parentff9d5bf277f693020777be2c241c9cea92693508
parentf88b95b4faad8f42d0481ad4fc8fca0ab43de430
Merge branch 'master' of git://git.pcp.io/kenj/pcp into kenj-merge