# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1577176973 0
# Node ID 962efe23975d6db6f24d5d87ba90f5c843a83225
# Parent  b6f93babebe80f18c787c92f24f7cc279e7130b4# Parent  fdc2bae50100fdb96150160b7dcccb876e0e74a0
Merge 0.11->trunk

diff -r b6f93babebe8 -r 962efe23975d core/rostermanager.lua