# HG changeset patch
# User luisf <luis.figueira@eecs.qmul.ac.uk>
# Date 1384194350 0
# Node ID cf78a7ade302a8b7c5ae894f3d7d3fafdcd5ca9d
# Parent  5e0957fe308dd2db7122debeedac3f57794bc9c4# Parent  b1f4c9a2af244645dab5e974abb1e7c348634dc1
Merge from branch "bug_794"