Merge branch 'master' into pkg_mgmt 49/1049/1
authorLaurence Maultsby <laurence.maultsby@riftio.com>
Mon, 30 Jan 2017 19:58:45 +0000 (14:58 -0500)
committerLaurence Maultsby <laurence.maultsby@riftio.com>
Mon, 30 Jan 2017 19:58:54 +0000 (14:58 -0500)
commit13f32c0c3cbad3b1d70d20342f44c65328c91ec9
tree8e96d5edefb89cbd17b14d8ebfb3f7d508c24e6a
parentdf332f582aae48baaf5b1fa51c15f3bf0bab0443
parent91aceafac5d6453d5decbde9ba03232abf108c3c
Merge branch 'master' into pkg_mgmt

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