# HG changeset patch
# User asaha
# Date 1419893170 28800
# Node ID 3b12cf144e8309eaf90c14eddf73033ce104f39c
# Parent  37b3ef9a07323afd2556d6837824db154cccc874# Parent  a24ec0deb4a8aa4e802fac940004d658c07d6599
Merge