Merge branch 'master' into popl2012
authorMatt McCutchen <matt@mattmccutchen.net>
Sat, 27 Aug 2011 23:33:19 +0000 (19:33 -0400)
committerMatt McCutchen <matt@mattmccutchen.net>
Sat, 27 Aug 2011 23:33:19 +0000 (19:33 -0400)
commite5c5cbd9d48ecf8de5e7b0c20d7164b4b7bf340b
treed551ed6972b0a71ee7ad082d5dc68cfa4395a3f6
parent86e209954803086a9a880fe3cd538d2c866cb8d6
parent256efdfa511d8d7d820ac565b5125271bc58ccf6
Merge branch 'master' into popl2012

Conflicts:
program/Main.hs

Semantic conflicts:
program/README (left a FIXME to adapt it for popl2012)
program/Main.hs
program/README