Merge branch 'master' into v1.1 83/983/1
authorLaurence Maultsby <laurence.maultsby@riftio.com>
Thu, 19 Jan 2017 01:41:08 +0000 (20:41 -0500)
committerLaurence Maultsby <laurence.maultsby@riftio.com>
Thu, 19 Jan 2017 01:41:30 +0000 (20:41 -0500)
commitd6d948e60162217694351891cb385498d5f2546e
tree9f3b66b079856b1ca1e35da84f912bfb46913880
parent3d62618d1cb1936b20b8c2b154321a9bf51ab225
parent261aceaca02982645f0181eca6b9b0ca56c24fa5
Merge branch 'master' into v1.1

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