Merge remote-tracking branch 'origin/master' into type-nats
authorIavor S. Diatchki <iavor.diatchki@gmail.com>
Sat, 7 Jan 2012 21:57:02 +0000 (13:57 -0800)
committerIavor S. Diatchki <iavor.diatchki@gmail.com>
Sat, 7 Jan 2012 21:57:02 +0000 (13:57 -0800)
1  2 
base.cabal

diff --cc base.cabal
Simple merge