Merge remote-tracking branch 'origin/v2.0'
authorJeremy Mordkoff <Jeremy.Mordkoff@riftio.com>
Mon, 1 May 2017 15:24:26 +0000 (11:24 -0400)
committerJeremy Mordkoff <Jeremy.Mordkoff@riftio.com>
Mon, 1 May 2017 15:24:26 +0000 (11:24 -0400)
commitb882ecd7bca6965de18bca855d54f699131da34d
tree31cd7d1dd9549e773081dea6e982d37f21c740c1
parentf33567a61c924f853194cb041965895558825829
parent76dd1b701b9989476ade833161be8a04acb3fd0a
Merge remote-tracking branch 'origin/v2.0'