Merge branch 'master' into master_vca_intg 68/968/1
authorLaurence Maultsby <laurence.maultsby@riftio.com>
Tue, 17 Jan 2017 15:39:52 +0000 (10:39 -0500)
committerLaurence Maultsby <laurence.maultsby@riftio.com>
Tue, 17 Jan 2017 15:40:13 +0000 (10:40 -0500)
commit109fb4a186f5393d5488f97a5e29c8f18973c35b
treebc81e0719184a3de32f02a6d2c4a08cfd28326a9
parent5d3c7164d13c5915370a48fb0b747a95777d9f24
parent3b361baaf9e583d59a0e5ce97db05fd8c497e59a
Merge branch 'master' into master_vca_intg

Signed-off-by: Laurence Maultsby <laurence.maultsby@riftio.com>
skyquake/plugins/composer/api/composer.js