# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1384709423 0
# Node ID c8f3a433abe62a66ce6b62011e03be9859206615
# Parent  f103c0693fbb677543cca9195233988498cbeaf7# Parent  d8b739c3d37a1d8e069d32097fd9ed73f0e4291d
Merge with stable