Merge branch 'master' into core-updates
gnu: luajit: Update to 2.0.3. * gnu/packages/lua.scm (luajit): Update to 2.0.3.
Merge branch 'master' into core-updates Conflicts: gnu-system.am
gnu: Add luajit * gnu/packages/lua.scm (luajit): New variable. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Merge branch 'master' into core-updates Conflicts: Makefile.am gnu/packages/base.scm
gnu: Add lua. * gnu/packages/lua.scm: New file. * Makefile.am: add it.