# HG changeset patch
# User asaha
# Date 1412264764 25200
# Node ID d99862aedaeb9042cea0b062a40589290726b35b
# Parent  e3757d7b81bbdaa15d84123bf9e94181b8129e48# Parent  37b01475faa409e13d262c7cc7f2dc1f96bf9676
Merge

diff -r e3757d7b81bb -r d99862aedaeb .hgtags