Merge branch 'master' into win2
commitca34c5d3a8ed97268688d2a03c03a80aac37b49c
authorJean-loup Gailly <jloup@gailly.net>
Wed, 10 Aug 2011 15:18:50 +0000 (10 17:18 +0200)
committerJean-loup Gailly <jloup@gailly.net>
Wed, 10 Aug 2011 15:18:50 +0000 (10 17:18 +0200)
treea1d55edc2593a9e1bc7312101d7c673344d9411c
parente61f99b155e4074e7b2fd68f0f9b2774e03a093e
parent95761281a353a8b166a473da21ed1e7eb9655b46
Merge branch 'master' into win2