Merge branch 'master' of git://git.pcp.io/mgoodwin/pcp into mgoodwin-merge
commit2688a46a08a6882e91defe6501954683ab482393
authorNathan Scott <nathans@redhat.com>
Wed, 27 Jan 2016 04:54:00 +0000 (27 15:54 +1100)
committerNathan Scott <nathans@redhat.com>
Wed, 27 Jan 2016 04:54:00 +0000 (27 15:54 +1100)
treef33467ea20721a1e3368c5ad5b49a0af606a29e0
parent4e40e24e807d7412b93969f3030332691272bd7c
parent539ea77b48a12e19f658fbc3c247d1517c7d2a50
Merge branch 'master' of git://git.pcp.io/mgoodwin/pcp into mgoodwin-merge