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

diff --cc base.cabal
Simple merge