Merge fixes in r10 maint branch
commite844e29bb0ce733df6f44e365f4c5f1baa7c69b2
authorIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Wed, 25 Aug 2010 23:25:12 +0000 (26 02:25 +0300)
committerIlari Liusvaara <ilari.liusvaara@elisanet.fi>
Wed, 25 Aug 2010 23:25:12 +0000 (26 02:25 +0300)
tree02b32572fa96046ad06e3def18e6ec6e9fcbd5d2
parentd89b89f97524affd7bb4b96b69208685562394ef
parent12854bf6589a67e24ff956ed9f88b1ba8e516a4d
Merge fixes in r10 maint branch

Conflicts:
Changelog.utf8
VERSIONINFO
Changelog.utf8
datafiles/luakernel