Merge branch 'master' into type-nats
authorIavor S. Diatchki <diatchki@galois.com>
Mon, 20 Jun 2011 17:32:11 +0000 (10:32 -0700)
committerIavor S. Diatchki <diatchki@galois.com>
Mon, 20 Jun 2011 17:32:11 +0000 (10:32 -0700)
commit6d1d9bd442151c2dd9ccf1a92439e663fa2c50c5
treec283a2d771d8a8d4dde31058a46a8c9cefe08015
parentfd5e2bb69a089abcc717396a765ffb67da6b00b3
parenta61aedc730e68a1b0c166b81a65a8ea575e8094b
Merge branch 'master' into type-nats

Conflicts:
base.cabal
libraries/base/base.cabal