commit 60fe52df6ddfc1e8a11f047a63d5fe7705f24eb5 parent 6e55560dfd25a8c113e940044b55d51cc473b3b8 Author: Georges Dupéron <jahvascriptmaniac+github@free.fr> Date: Fri, 15 Oct 2010 22:43:03 +0200 Merge branch 'master' of github:dumbs/2010-m1s1-compilation Conflicts: VM/instruction.lisp