# HG changeset patch
# User Dennis Fink <dennis.fink@c3l.lu>
# Date 2015-10-19 23:55:04
# Node ID a157ce848a118400c53b1878a367759aa317afba
# Parent  2cd934dc8bb9ec57eaf2043259affd6e84043876
# Parent  20c97cbcdaa8f176f358bf2aa3a79478f151c5d0

Merge