From: Adam Megacz <megacz@cs.berkeley.edu>
Date: Thu, 3 Mar 2011 02:56:39 +0000 (-0800)
Subject: Merge branch 'master' of /tmp/ghc-garrows; branch 'master' of http://git.megacz.com... 
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=cf686352ffb4cf6e04cb94f1c673e394f6ff05c1;ds=sidebyside

Merge branch 'master' of /tmp/ghc-garrows; branch 'master' of git.megacz.com/ghc-garrows
---