Merge branch 'master' into type-nats
authorIavor S. Diatchki <iavor.diatchki@gmail.com>
Wed, 14 Mar 2012 05:00:16 +0000 (22:00 -0700)
committerIavor S. Diatchki <iavor.diatchki@gmail.com>
Wed, 14 Mar 2012 05:00:16 +0000 (22:00 -0700)
commit328b3926626a7f492e76b9e0b1c1a9bea6e0bd07
treec73e913118aa8e8d20b88b7ca708e1b840b98b1c
parenta656b684f4a279463bd7f261f6e7209f72d8ed8e
parent48df85c45e50d18a1e34f2db82a58e74dea6bbef
Merge branch 'master' into type-nats
base.cabal