# HG changeset patch
# User asaha
# Date 1412264711 25200
# Node ID 93c74efa2c4462bddddd2c2b870cfda49cdac7a7
# Parent  b16738945803203e2f1c95478eb4e3395a281abb# Parent  af55a74be9b6bf203cc77a50b724883a07c312c3
Merge

diff -r b16738945803 -r 93c74efa2c44 .hgtags