# HG changeset patch
# User asaha
# Date 1444849416 25200
# Node ID f3c71687f52b6c4c331af8f6d200f677b367995c
# Parent  3ec1fffeb85810160062ce5bc0b817a60db81da2# Parent  c2dfd71d7eeda60dab6e336047b934b58607b5a5
Merge