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)
1  2 
base.cabal

diff --cc base.cabal
Simple merge