5414: Merge branch 'master' into 5414-keep-service-hints
authorTom Clegg <tom@curoverse.com>
Mon, 13 Apr 2015 20:24:02 +0000 (16:24 -0400)
committerTom Clegg <tom@curoverse.com>
Mon, 13 Apr 2015 20:24:02 +0000 (16:24 -0400)
commit3280e2dc5fd16dca63c389b931658d4420faabaf
tree8d52425b7140cf4325dd7a3f18e43ad59568a6f6
parent9fb28073a1c7a140e44a20e0555028e9a9dbcf51
parenta8ef8be836b1805b4e35922ea787caad7b81f689
5414: Merge branch 'master' into 5414-keep-service-hints