# HG changeset patch # User Pierre-Yves David # Date 1493807500 -7200 # Node ID 65b4a8c40fad094eee1a56402d68f2e8f74fb5cc # Parent 18b8dc058f75d41bf7c621cafc2046dfcd6c02ff# Parent b9ce138eca63670aef0ccdc8048a457f4251bc14 merge with default for 6.1.0