# HG changeset patch
# User smith@nwoca.org
# Date 1501530614 -3600
# Node ID 4bc3485f84601ba884b7da7042884c0cab07c5e7
# Parent  018f62da193180f0cd4977a4213700e9261072c5# Parent  570e192c21b49b88c656931d1ca1bee4b7bcfe04
merge