# HG changeset patch
# User David A. Holland
# Date 1434088552 14400
# Node ID 8d8a4bfd4684013fd66628b7d221d1c59ca7fb02
# Parent  fa9752f194c6538336d48e4ab5fc98dce7fe5d92# Parent  e6eb15635a48ee437e97154dbc62d840e45ce80b
Merge from upstream

diff -r fa9752f194c6 -r 8d8a4bfd4684 macro.c