Merge branch 'master' of git://git.pcp.io/kenj/pcp into kenj-merge
commitd71813db974686c06575d30c3c6429c2e94f42c9
authorNathan Scott <nathans@redhat.com>
Wed, 2 Mar 2016 22:27:45 +0000 (3 09:27 +1100)
committerNathan Scott <nathans@redhat.com>
Wed, 2 Mar 2016 22:27:45 +0000 (3 09:27 +1100)
treeb38c7339d4bd7dfaa472b721e84e6961506e8ff4
parent22fdcd707d64ad35e68c057c8c66478e427c464a
parente382507571c5dc9077a09add0bd5c75cdf587990
Merge branch 'master' of git://git.pcp.io/kenj/pcp into kenj-merge