Merge commit '0d2fcdb1c5c9e844c232e5429130727121990d0e'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Mon, 18 Apr 2016 14:00:13 +0000 (15:00 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Mon, 18 Apr 2016 14:00:18 +0000 (15:00 +0100)
commit1be5509fbbc6d1675074ca58a546eba26c63ec74
tree4d27959ae028c178e8db4cf2c0478d0f4bb2dd45
parentce18e48aec5dd163ab9ff46071f801fb73b1945a
parent0d2fcdb1c5c9e844c232e5429130727121990d0e
Merge commit '0d2fcdb1c5c9e844c232e5429130727121990d0e'

These commits are no-ops. Not going to merge these since our opt
tests are more complex, and have several blocks with different
options.

* commit '0d2fcdb1c5c9e844c232e5429130727121990d0e':
  opt-test: Merge struct declaration and initialization
  opt-test: Move some variable declarations to avoid block braces

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>