# HG changeset patch
# User asaha
# Date 1412264850 25200
# Node ID 0560fba0bc3a7413d301395e2a07ef795c97aeb8
# Parent  60f1f86994e1b5c7fdd7981dcccace0a5d88f8ee# Parent  428e573b61c1f929ca6c89644fd31ea64df74f0d
Merge

diff -r 60f1f86994e1 -r 0560fba0bc3a .hgtags