# HG changeset patch # User Alpar Juttner # Date 1376227830 -7200 # Node ID 76284e152f69fd56fc7fa9737631fbf504b51917 # Parent 92d53f86d1a907c8430d8733f881de4ce31a3fdd# Parent 6c8e2d8712d8c09ad85788acce9eee2666fa5e72 Merge headmerge to branch 1.2