Merge branch 'nasm-2.09.xx'
commit5b49af4ff244d94a1695484e14666471881a8a56
authorCyrill Gorcunov <gorcunov@gmail.com>
Fri, 15 Jul 2011 21:44:57 +0000 (16 01:44 +0400)
committerCyrill Gorcunov <gorcunov@gmail.com>
Fri, 15 Jul 2011 21:44:57 +0000 (16 01:44 +0400)
tree33a4a6415453b983212ef682c650025a59a679f8
parent98de3349499d7222091588afc32f420ce0af36a1
parentfbde522e058a6a0f406e73f7022ef48d813060d5
Merge branch 'nasm-2.09.xx'

Conflicts:
version

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