# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1384950414 0
# Node ID 12c752c0a02b81e2a11ae8111e46433bbf5b8d11
# Parent  c8f3a433abe62a66ce6b62011e03be9859206615# Parent  164ed9bf157c5020c7b6ab47d05c3297d1806b29
Merge with stable