Merge remote-tracking branch 'upstream/variable-arity' into gh-pages
authorrayslava <rayslava@gmail.com>
Sun, 20 Jan 2013 15:07:23 +0000 (19:07 +0400)
committerrayslava <rayslava@gmail.com>
Sun, 20 Jan 2013 15:07:23 +0000 (19:07 +0400)
Conflicts:
ecmalisp.lisp

1  2 
ecmalisp.lisp

diff --cc ecmalisp.lisp
Simple merge