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)
commit2d05797b4b5192e3abe5c5ec570b0bd06713d669
tree26ea69c376d9588b4986d418dd4aeddc7c3c2d8b
parentf23644b0d302a5eb6c3ab318f408e6ea251c9851
parent0e1a02b96cfd03b8488e3ff4ce232466d6d5ca77
Merge branch 'master' into type-nats
base.cabal