# HG changeset patch # User Augie Fackler # Date 1415209894 18000 # Node ID bc3d0e4964241eeba9b1f4ccb7e1a77a486e2fcb # Parent d07ccad28b1a8f8fdef4144812e1b9af75ac7f6b# Parent ee4d0f91eaf98b56eddcfa04b616de939148f02b Merge stable back into default.