Merge branch 'devel-0.9.0'
authorThomas M. Hermann <thomas.m.hermann@odonata-research.com>
Sun, 14 Oct 2012 22:47:52 +0000 (17:47 -0500)
committerThomas M. Hermann <thomas.m.hermann@odonata-research.com>
Sun, 14 Oct 2012 22:47:52 +0000 (17:47 -0500)
commit65f1169ae22cce46ba60b44ccbb2b126b6452307
tree8009db292b87f95e3ab70b6e5e27c737f1cc6361
parent4e1e696730e6974c0c3416b7dc27ccc47893d92f
parentd81f22340448378857a673323663d88ca47bcd89
Merge branch 'devel-0.9.0'

Conflicts:
lisp-unit.lisp
lisp-unit.lisp