Merge branch 'v2.0' 38/1838/1
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)
commit3cfa5123b73abd2b5b90917f14e4d41567bab98d
tree55529db4655f02ff3bb7d8f046a9a09659de0dba
parentf32a4bdd144eefe6e5e112b7359d3d26b4ff5bbb
parentd9d683f65ea6e428ac966adf4b9b8f3fcfbda3a6
Merge branch 'v2.0'

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