Merge branch 'master' of git://git.pcp.io/kenj/pcp into kenj-merge
commit49d90ad6c50ff665ce68b63449055b28d73e37c8
authorNathan Scott <nathans@redhat.com>
Mon, 27 Jun 2016 03:58:28 +0000 (27 13:58 +1000)
committerNathan Scott <nathans@redhat.com>
Mon, 27 Jun 2016 03:58:28 +0000 (27 13:58 +1000)
treedda48fdbdfa53964a2e604c4a6fd5161b67ce6d5
parent8535034395b808b49810b0f666a2989fc291b11b
parentb273001897d1c648c6667fa27f8d2b3179a09d87
Merge branch 'master' of git://git.pcp.io/kenj/pcp into kenj-merge