Merge pull request #949 from kzc/collapse_vars_conditions
authorMihai Bazon <mihai.bazon@gmail.com>
Fri, 29 Jan 2016 16:05:39 +0000 (18:05 +0200)
committerMihai Bazon <mihai.bazon@gmail.com>
Fri, 29 Jan 2016 16:05:39 +0000 (18:05 +0200)
collapse_vars: fix if/else and ternary operator side effects


Trivial merge