Merge branch 'rs/logical-vs-binary-or' into maint

* rs/logical-vs-binary-or: use logical OR (||) instead of binary OR (|) in logical context

Junio C Hamano committed Jul 19, 2013 at 10:42 UTC 52c19991cb86c81068c2ac7d8164643d8593bb50

No changes.