# HG changeset patch
# User asaha
# Date 1380312949 25200
# Node ID 8bc05990295072d69f665530d614e674ea98f142
# Parent  6a8e3930abcc40ce0a21d9c54fe00af7970c9cff# Parent  93c0a4abb398fb2320d16ed7e5aa37cad67eae45
Merge

diff -r 6a8e3930abcc -r 8bc059902950 .hgtags