Merge branch 'patch-2' of https://github.com/fanyeren/pcp into fanyeren-patch-2
commitabb6d5e4f1ef99d097a7655818923d0a14cca49c
authorNathan Scott <nathans@redhat.com>
Mon, 14 Nov 2016 21:39:15 +0000 (15 08:39 +1100)
committerNathan Scott <nathans@redhat.com>
Mon, 14 Nov 2016 21:39:15 +0000 (15 08:39 +1100)
tree053fe8b91c21c8e1e8b3369be289e035af5091c2
parentc1212361474ff2548e26b39fcce61b6250c9b07d
parente67f973ef9cc6dbe8fb7708f483418fe77aa607e
Merge branch 'patch-2' of https://github.com/fanyeren/pcp into fanyeren-patch-2