merge from v1.0
authorJeremy Mordkoff <Jeremy.Mordkoff@riftio.com>
Fri, 23 Dec 2016 21:18:00 +0000 (16:18 -0500)
committerJeremy Mordkoff <Jeremy.Mordkoff@riftio.com>
Fri, 23 Dec 2016 21:18:00 +0000 (16:18 -0500)
commitc33673480c15d6e64402b547563640b2025a3cd6
tree74f01e5256c7a9c57c05ca9af3f9674923a4c7ae
parentf8b1c530725ad1c0f49868575a567627c879c4af
parenta62b036d637362012bd038376cbd3bfadd2a406c
merge from v1.0

Signed-off-by: Jeremy Mordkoff <Jeremy.Mordkoff@riftio.com>
BUILD.sh