From: Marco Baringer <mb@bese.it>
Date: Sat, 9 Feb 2013 10:39:53 +0000 (+0100)
Subject: Merge remote-tracking branch 'cl-fiveam/master' into rt
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=b47f8f7abd7d914c9849254977939ae405ac8644;p=fiveam.git

Merge remote-tracking branch 'cl-fiveam/master' into rt

Conflicts:
	src/test.lisp
---

b47f8f7abd7d914c9849254977939ae405ac8644