# HG changeset patch
# User Andrey Skvortsov <andrej.skvortzov@gmail.com>
# Date 1476284092 -10800
# Node ID c43f1c254180213c54a383280c72d82b33bf5df4
# Parent  df3e2792fd58acceccd4f03ac444e130f874482a# Parent  26e13a61db6892f918442ccc54b8703db3b0ab73
merge