Merge branch 'master' into strasbourg
commitd1169d91289bf0394a3b6885cfa130bad1356eb4
authorJean-loup Gailly <jloup@gailly.net>
Wed, 3 Aug 2011 18:05:23 +0000 (3 20:05 +0200)
committerJean-loup Gailly <jloup@gailly.net>
Wed, 3 Aug 2011 18:05:23 +0000 (3 20:05 +0200)
tree1295b02a5b38991544b89389a295f82e587d6971
parent2a84cfd92681c8560ad42801ee7b42dc44f6385f
parent7e92ae9cb6f59d0f83165f328b76c726983569fe
Merge branch 'master' into strasbourg