Merge branch 'master' into type-nats
authorIavor S. Diatchki <iavor.diatchki@gmail.com>
Thu, 29 Dec 2011 22:36:08 +0000 (14:36 -0800)
committerIavor S. Diatchki <iavor.diatchki@gmail.com>
Thu, 29 Dec 2011 22:36:08 +0000 (14:36 -0800)
commit914da193e11682add0d92d6d42a64446faf219d4
treec41935e748fb3bb1ecd722bffdb0639d6e6ea535
parent6d1d9bd442151c2dd9ccf1a92439e663fa2c50c5
parentd5ead92698442c8d3bd6e69a40a85b72a55b4dcc
Merge branch 'master' into type-nats
libraries/base/base.cabal