# HG changeset patch
# User Nicholas Jillings <nicholas.jillings@eecs.qmul.ac.uk>
# Date 1434555793 -3600
# Node ID 9e27ca8110516ec37b9369e155cb0be1d0d2ad46
# Parent  0560fe84fde6aacbc406ebe2511393c76911564e# Parent  d8bad6edaa9560fe90fd74b40915ca70d5a9b2c5
Merge into default