# HG changeset patch
# User John Tsiombikas <nuclear@member.fsf.org>
# Date 1440616290 -10800
# Node ID 0f4333d2ce65b26ca29793bc351138b42b478ec4
# Parent  e94aa99c121e08c8515151a836f020ca3d4526c0# Parent  3b9fd940dd984bdd402ae7c1498950b91ed5e5c6
merged?