Merge branch 'logging-tweak'
commitd1e4a7b20076c815ae5eb035fc70f4e4a34a5009
authorGary King <gwking@franz.com>
Sun, 25 Apr 2010 18:56:16 +0000 (25 14:56 -0400)
committerGary King <gwking@franz.com>
Sun, 25 Apr 2010 18:56:16 +0000 (25 14:56 -0400)
tree56f2cf057953399328269f11d6ec30c24100fd35
parent9ef8b2050fe969deaf0cc0dc94e6413a8febf899
parenta331a1eb2df8163961be78652e01b3e901d0f3b6
Merge branch 'logging-tweak'

Conflicts:
dev/lift.lisp
website/website.tmproj