Merge remote-tracking branch 'origin/master' into type-nats
authorIavor S. Diatchki <iavor.diatchki@gmail.com>
Sun, 12 Feb 2012 21:18:19 +0000 (13:18 -0800)
committerIavor S. Diatchki <iavor.diatchki@gmail.com>
Sun, 12 Feb 2012 21:18:19 +0000 (13:18 -0800)
1  2 
base.cabal

diff --cc base.cabal
Simple merge