# HG changeset patch
# User asaha
# Date 1482270274 28800
# Node ID 6c274a559c4f16b8d6db5e06aad1f78ac374dad1
# Parent  402f4272fcfce309b3bd861e7c1a4d3c1ab78717# Parent  750af7e92827ebb16f441b0ff45e5a6d729e9a45
Merge