# HG changeset patch
# User Andrey Skvortsov <andrej.skvortzov@gmail.com>
# Date 1538570879 -10800
# Node ID 9554952d36d73aff3ee264cf763c50b7ae65a2a8
# Parent  aef7f2ca4e69e21208f3877759a942dd52da3537# Parent  68e6649039a55f75b0f86eecb91f86f3ae1a68d3
merge