Merge branch 'v1.1' 61/1061/1
authorLaurence Maultsby <laurence.maultsby@riftio.com>
Wed, 1 Feb 2017 15:54:25 +0000 (10:54 -0500)
committerLaurence Maultsby <laurence.maultsby@riftio.com>
Wed, 1 Feb 2017 15:54:41 +0000 (10:54 -0500)
commitee62263ef24875dbd041193584c5d0fc4de8146a
tree9632706063f48a14bd724aa9a16d1ac1bf2ab6ac
parent73b4ff94fca62a769a0bc13971a05cd18e177b33
parent756a58911e5ab70e42b7793ffef9807738d2f5e1
Merge branch 'v1.1'

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