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)
commit30c0c022666406bdbb28fc71c6bcc6bf047cc69c
treedf51f72570bfdddaa0f40d205a2573a04b47641a
parente184fccb75860c8af42b6cb789923e242f67fd7d
parentad42fd975c8b750e1b7d2762957c67bfd773dd44
Merge remote-tracking branch 'origin/master' into type-nats
libraries/base/base.cabal