# HG changeset patch
# User asaha
# Date 1412264684 25200
# Node ID f82925250faa37a81f1a70f21d442a27df032734
# Parent  9e62097dde35cf06e9df0c281ed1b984987b4fda# Parent  abe48bc84ae41c3b62cf6c85e3d4718455ed6dc2
Merge

diff -r 9e62097dde35 -r f82925250faa .hgtags