# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1381150293 -3600
# Node ID ce8024f2783737529f88dd7c31f5658861c3776b
# Parent  115d2b6a8a9c62925751d8dca228b3c24eaef98e# Parent  d69c1db7cf8b71c18cd6cb469bc1f10fd3fe79a4
Merge with stable