# HG changeset patch
# User lana
# Date 1407774330 25200
# Node ID e5967ea9bde2ef28b06c944c2a92b2820c61b7a4
# Parent  63fbc565bba5c9132ec09582ffce4679a17c9b9a# Parent  eb26234bf435364976681c1916750be2083c3de8
Merge