Merge commit '25bacd0a0c32ae682e6f411b1ac9020aeaabca72'
authorJames Almer <jamrial@gmail.com>
Thu, 16 Mar 2017 00:13:54 +0000 (21:13 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 16 Mar 2017 00:13:54 +0000 (21:13 -0300)
* commit '25bacd0a0c32ae682e6f411b1ac9020aeaabca72':
  Don't use expressions with side effects in macro parameters

This commit is a noop. It would be reverted in a future merge either
way.

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

Trivial merge