# HG changeset patch # User Christian Ebert # Date 1366462134 -3600 # Node ID 45a6eace22bf28d557731e2c4848fa837f3561ed # Parent 757cf8d4724bdefb796fc6582267c43fc890812d# Parent 01c23fd3d4249af4cf4eeac23135e6f2eb398dc7 Merge with stable