Merge tag 'nasm-2.13.03rc1'
commit2f47c3c2298a86e9e7cc495673dbd7f5f4d23c3d
authorH. Peter Anvin <hpa@zytor.com>
Mon, 8 Jan 2018 21:01:27 +0000 (8 13:01 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Mon, 8 Jan 2018 21:01:27 +0000 (8 13:01 -0800)
treea6a77504eaf330832789ab8622b1a79307bfb333
parentc90d99a6553565605d18b37e3fe53d754eacd151
parent2eb00b5fe190f4d05eb60b2a6ee8b1818222900e
Merge tag 'nasm-2.13.03rc1'

NASM 2.13.03rc1

Resolved Conflicts:
version

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