Merge branch 'v2.0'
authorLaurence Maultsby <laurence.maultsby@riftio.com>
Tue, 16 May 2017 17:10:27 +0000 (13:10 -0400)
committerLaurence Maultsby <laurence.maultsby@riftio.com>
Tue, 16 May 2017 17:10:49 +0000 (13:10 -0400)
commit7d4f9d996741de733e168ff9e1a07770fdbac82a
tree55529db4655f02ff3bb7d8f046a9a09659de0dba
parent9a4c35c99529d07696b140c4e35e06d9aac2cfe3
parent050addf0f28cea6424cc8dabf1a1a8ee80346732
Merge branch 'v2.0'

Signed-off-by: Laurence Maultsby <laurence.maultsby@riftio.com>