Merge "fix 'unary operator expected' in conditional expression" into stable/brahmaputra
authorTim Rozet <trozet@redhat.com>
Tue, 2 Feb 2016 19:33:37 +0000 (19:33 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Tue, 2 Feb 2016 19:33:37 +0000 (19:33 +0000)

Trivial merge