Merge branch 'v1.1' 24/1124/1
authorLaurence Maultsby <laurence.maultsby@riftio.com>
Thu, 16 Feb 2017 18:53:01 +0000 (13:53 -0500)
committerLaurence Maultsby <laurence.maultsby@riftio.com>
Thu, 16 Feb 2017 18:53:48 +0000 (13:53 -0500)
commit0f1028b64a33407bbc792d2ebe3afbf73ca46ec3
tree6473c4adaab027c76b4ebadc6536b7f83a03cab6
parent1cf555b91e7e91d53d68d56d3c05677c172a5dab
parent80c1612af17d44cda42732f6a13fd87e6f28966e
Merge branch 'v1.1'

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