Merge branch 'master' into popl2012
authorMatt McCutchen <matt@mattmccutchen.net>
Sun, 12 Feb 2012 06:41:53 +0000 (22:41 -0800)
committerMatt McCutchen <matt@mattmccutchen.net>
Sun, 12 Feb 2012 06:41:53 +0000 (22:41 -0800)
commit1a8dd46727a20bad8164af908ad027eac6abc6cc
treea68c4c8a746823ec69520440880b732ebfde186c
parente5c5cbd9d48ecf8de5e7b0c20d7164b4b7bf340b
parent17e0995d8f3673797f5280189e28e727db454f7f
Merge branch 'master' into popl2012

Conflicts:
program/ProposalMatcher.hs
program/ProposalMatcher.hs