Merge branch 'master' of ../HEAD
authorSimon Peyton Jones <simonpj@microsoft.com>
Tue, 10 Jul 2012 15:20:49 +0000 (16:20 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Tue, 10 Jul 2012 15:20:49 +0000 (16:20 +0100)
commit4450cc7f05c65544514c28aca12a79f78ecf75fb
tree58a0427ea84902dd800bbeb21295241fdb5341c5
parent8bbdab1852beda96213ab18d228eb7a1002cedb6
parentb8bfab8076f1d8fd5ed1d634fee82fd4d2fc0ed8
Merge branch 'master' of ../HEAD