Commit 42b2bcf038b4e45df33a1078dd05a95759addd35

Vicent Martí 2013-05-02T13:42:16

Merge pull request #1538 from ethomson/merge_warning_cleanup braces