# HG changeset patch
# User asaha
# Date 1380313115 25200
# Node ID e4db78716919c95e9c604230d7c3cf5a92922277
# Parent  f8576d750234109e32d5b6da91056152ccd3d42d# Parent  5b0c0a847e1387eb171f5e6f5269cc138c05704f
Merge

diff -r f8576d750234 -r e4db78716919 .hgtags