[galaxy-dev] updates with hg incoming