Merge "joid: WIP public API proxy"
authorNarinder Gupta <narinder.gupta@canonical.com>
Thu, 24 Mar 2016 16:39:46 +0000 (16:39 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Thu, 24 Mar 2016 16:39:46 +0000 (16:39 +0000)

Trivial merge