Merge branch 'pxechn-fix-news-for-hpa-2' of git://github.com/geneC/syslinux
authorMatt Fleming <matt.fleming@intel.com>
Thu, 11 Oct 2012 20:16:37 +0000 (21:16 +0100)
committerMatt Fleming <matt.fleming@intel.com>
Thu, 11 Oct 2012 20:17:58 +0000 (21:17 +0100)
commit940d4876ab8dc6dcbdbf47ba8be98cba0516c66e
treeb42256b0f3344a52622febf3306933ae1f8bd864
parent7d9ee65cc9577eb69782a49a34895ae80820e9ff
parent85dba2c3058996d72def4a44304df882da3aa807
Merge branch 'pxechn-fix-news-for-hpa-2' of git://github.com/geneC/syslinux

Conflicts:
NEWS
com32/modules/Makefile
NEWS
com32/modules/Makefile