Merge branch 'master' of http://git.stderr.nl/matthijs/master-project/paper
authorChristiaan Baaij <baaijcpr@wlan228123.mobiel.utwente.nl>
Tue, 2 Mar 2010 15:50:46 +0000 (16:50 +0100)
committerChristiaan Baaij <baaijcpr@wlan228123.mobiel.utwente.nl>
Tue, 2 Mar 2010 15:50:46 +0000 (16:50 +0100)
commit82fbaedde6f9c1789576d0f715fc3a0686b2d20f
treeb3f2c6dba2455764eb6ae24f3736301fd489143f
parentb67d2a163cc5e8d55cecc17cc0ca2d7dcfb827e8
parent64a90253f6e0a97204415d78612bc828e83a313f
Merge branch 'master' of git.stderr.nl/matthijs/master-project/paper

Conflicts:
cλash.lhs
cλash.lhs