Merge branch 'dense-intset'
authorMilan Straka <fox@ucw.cz>
Tue, 22 Nov 2011 18:00:26 +0000 (19:00 +0100)
committerMilan Straka <fox@ucw.cz>
Tue, 22 Nov 2011 18:00:26 +0000 (19:00 +0100)
commite20133f4e2f843be87827ab86ae71946b1db7181
tree217faee6a689a22007c3fe417004678d436eb385
parent36ae5c3432dfd3249555b711d37e097cdfa5078a
parent34bdac9107e1dcc720be62723faa1b570b4eae4e
Merge branch 'dense-intset'

Conflicts:
containers.cabal
containers.cabal