# HG changeset patch
# User asaha
# Date 1412264675 25200
# Node ID c6aec96088b10436070f18340c9e5efa297d4371
# Parent  3733a04755c6115e866ab2174e088ceec44a424f# Parent  875565f68e40e19cba446a64a3804e6a2fb313f4
Merge

diff -r 3733a04755c6 -r c6aec96088b1 .hgtags