]> git.ipfire.org Git - thirdparty/LuaJIT.git/commitdiff
Merge branch 'master' into v2.1
authorMike Pall <mike>
Wed, 11 Mar 2015 16:47:32 +0000 (17:47 +0100)
committerMike Pall <mike>
Wed, 11 Mar 2015 16:47:32 +0000 (17:47 +0100)
1  2 
doc/status.html

diff --cc doc/status.html
Simple merge