Merge branch 'v1.1' 56/1056/1
authorLaurence Maultsby <laurence.maultsby@riftio.com>
Tue, 31 Jan 2017 19:54:49 +0000 (14:54 -0500)
committerLaurence Maultsby <laurence.maultsby@riftio.com>
Tue, 31 Jan 2017 19:55:14 +0000 (14:55 -0500)
commit73b4ff94fca62a769a0bc13971a05cd18e177b33
tree0627fe89198271ed9ce4e6d588c9e375d94d753c
parent91aceafac5d6453d5decbde9ba03232abf108c3c
parent9a3d7a41e02a0e291afe24f849e29230df751751
Merge branch 'v1.1'

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