Merge branch 'master' into win2
commit1cae9b63f82430ebdcc388635f6952a1a2d89aa6
authorJean-loup Gailly <jloup@gailly.net>
Wed, 10 Aug 2011 16:47:53 +0000 (10 18:47 +0200)
committerJean-loup Gailly <jloup@gailly.net>
Wed, 10 Aug 2011 16:47:53 +0000 (10 18:47 +0200)
treecda7345983062405f2a0b6316ab29497881940f2
parentca34c5d3a8ed97268688d2a03c03a80aac37b49c
parent92d5d2ccda2e5d771d4c3968dffd61bf1f4af4a4
Merge branch 'master' into win2