Merge branch 'tonylocal' of git://repo.or.cz/CommonLispStat.git into lsobjToProto
commitdf94e9124a620944d53a3edee8208fab9c5651cc
authorAJ Rossini <blindglobe@gmail.com>
Sun, 9 Mar 2008 12:06:04 +0000 (9 13:06 +0100)
committerAJ Rossini <blindglobe@gmail.com>
Sun, 9 Mar 2008 12:06:04 +0000 (9 13:06 +0100)
tree8a769ba81ce11d8b3c9e3f76c1c41c5e7facb2ba
parent410f01d569e8436336bc0cea18d0a9aa36eb6199
parent4ecbe8a87f9f209cfcf6d62ed226464fd240fab8
Merge branch 'tonylocal' of git://repo.or.cz/CommonLispStat.git into lsobjToProto

Conflicts:

ls-demo.lisp
ls-demo.lisp