Merge tag 'nasm-2.13.02'
commit670db2fd35b5d9a630372b9f7fabb06941e02fe9
authorH. Peter Anvin <hpa@linux.intel.com>
Wed, 29 Nov 2017 19:31:36 +0000 (29 11:31 -0800)
committerH. Peter Anvin <hpa@linux.intel.com>
Wed, 29 Nov 2017 19:31:36 +0000 (29 11:31 -0800)
treec221e11b9bc02b761615fa5c256595fd86564f6d
parent53d8f220e16a19edcc9d71be062a8d77db5f03d7
parentfe2f6de2ee85959747a4e4a99ea43a38509cc3b2
Merge tag 'nasm-2.13.02'

NASM 2.13.02

Resolved Conflicts:
version

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>