Merge branch 'nasm-2.09.xx'
commit27fe347a8b5834ac4f181e7cddfc2bb7b613d4c7
authorCyrill Gorcunov <gorcunov@gmail.com>
Wed, 27 Oct 2010 18:42:12 +0000 (27 22:42 +0400)
committerCyrill Gorcunov <gorcunov@gmail.com>
Wed, 27 Oct 2010 18:42:12 +0000 (27 22:42 +0400)
tree984a74c8ce4e0453ab9012b8347e0a24e70319dd
parente0fdd77584b22afc319e7ae22649d48e7668ad86
parent4794de2f5b1850d5b456d903bead541fee351566
Merge branch 'nasm-2.09.xx'

Conflicts:
version

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
doc/changes.src