Merge branch 'master' into derm10
commitc2ef2a9c8af6415a4ddb81d52c7f95570741e648
authorJean-loup Gailly <jloup@gailly.net>
Sat, 21 Apr 2012 15:01:26 +0000 (21 17:01 +0200)
committerJean-loup Gailly <jloup@gailly.net>
Sat, 21 Apr 2012 15:01:26 +0000 (21 17:01 +0200)
tree2ffe2697b0ac0c2dea69b603bb60ee4bed9d14fe
parent15d5b939c91d61b539ca28786917220c5c806c8b
parent00a23dc8cf9125d35ab44446ea6c424e8bd09535
Merge branch 'master' into derm10