Merge commit '9806b9ab5c7fb2ac5efd8ffa8713fea0c5fd218d'
authorJames Almer <jamrial@gmail.com>
Thu, 16 Mar 2017 00:33:13 +0000 (21:33 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 16 Mar 2017 00:33:13 +0000 (21:33 -0300)
commit86fb169df5895cc72835d6edd9b9c987f0bcf130
treeff57678b4e6de4f32e58eb9dfe27acaab64a1a79
parent30fe4b8d4ce2ae0272f983f454a94f27b62f8c67
parent9806b9ab5c7fb2ac5efd8ffa8713fea0c5fd218d
Merge commit '9806b9ab5c7fb2ac5efd8ffa8713fea0c5fd218d'

* commit '9806b9ab5c7fb2ac5efd8ffa8713fea0c5fd218d':
  Revert "Don't use expressions with side effects in macro parameters"

This commit is a noop.

Merged-by: James Almer <jamrial@gmail.com>