# HG changeset patch # User contrebasse # Date 1305912553 -7200 # Node ID 0fd1fd1ba2d9349d2a2acbbd5fd1dc0d72339c29 # Parent b980c00affcd7dfd344d9fd188ed1b3cc96e23e5# Parent 4d376d031f8d927760a2a360bcaa2b8a97686540 Automated merge with ssh://hg.wowace.com/wow/reagentmaker/mainline