# HG changeset patch
# User John Tsiombikas <nuclear@member.fsf.org>
# Date 1445309521 -10800
# Node ID 1e72e35a85ee942571ae0da690843d019aa86d3a
# Parent  00f98842608ff384bb57b46d815fd50764ac5d33# Parent  c027171c1563632a6817fc44452a79092bbed6bf
merged