Merge branch 'v1.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)
commit625a4c2118c4d095daf2a264643798eddf4d0491
tree6473c4adaab027c76b4ebadc6536b7f83a03cab6
parentb6bb9b5e3f414e408ea622cc4b0753b7f19d6242
parent80c1612af17d44cda42732f6a13fd87e6f28966e
Merge branch 'v1.1'

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