tree bbcdb06bb9104139384934be17f43cdfa95dc3f0
parent 64b803dbd876e15a0a2d4ca46d8ce81ac18915f6
parent 5c4722a7fb7e022971726d729e87b094ac891aee
author Laurence Maultsby <laurence.maultsby@riftio.com> 1485357062 +0100
committer Laurence Maultsby <laurence.maultsby@riftio.com> 1485358834 -0500

Merge "Merge branch 'pkg_mgmt' into v1.1" into v1.1

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