tree 5f5b11703f64319bcb71603c825d382f4703a763
parent fbae3d9ace0b71f8db62cde127fa6fe24c40380c
parent 235e8d591480d7e1378c27fe65c5529625d4b5be
author Junio C Hamano <gitster@pobox.com> 1397070206 -0700
committer Junio C Hamano <gitster@pobox.com> 1397070206 -0700

Merge branch 'jl/nor-or-nand-and' into maint

* jl/nor-or-nand-and:
  code and test: fix misuses of "nor"
  comments: fix misuses of "nor"
  contrib: fix misuses of "nor"
  Documentation: fix misuses of "nor"