# HG changeset patch
# User smith@nwoca.org
# Date 1493044905 -3600
# Node ID a2054815e873c6103a7923427fb9fc26d6efa413
# Parent  5e3cf6b7e3311638d34db1db53074b29914ecbb7# Parent  7d781c05795661213d7b60e119ee0b50c0567813
complete merge