Merge branch 'master' into popl2012
authorMatt McCutchen <matt@mattmccutchen.net>
Sun, 12 Feb 2012 18:33:43 +0000 (10:33 -0800)
committerMatt McCutchen <matt@mattmccutchen.net>
Sun, 12 Feb 2012 18:33:43 +0000 (10:33 -0800)
commit56b2309d91ad118a6758b8e5d904b3ac4edc49ce
treecebc361792b3e7711779a3c97ca8ec16ab4c2df7
parentfe03e0e8d2f2de007b110f0a080e305530918f01
parent4480e9b3a0554050787736048c6ce6f6e2b88f78
Merge branch 'master' into popl2012