From: Christiaan Baaij <baaijcpr@wlan228123.mobiel.utwente.nl>
Date: Tue, 2 Mar 2010 15:50:46 +0000 (+0100)
Subject: Merge branch 'master' of http://git.stderr.nl/matthijs/master-project/paper
X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fmaster-project%2Fdsd-paper.git;a=commitdiff_plain;h=82fbaedde6f9c1789576d0f715fc3a0686b2d20f;hp=82fbaedde6f9c1789576d0f715fc3a0686b2d20f

Merge branch 'master' of git.stderr.nl/matthijs/master-project/paper

Conflicts:
	cλash.lhs
---