Merge branch 'master' into greedy2
commit3af9c19af4caa6ca21a5f684bbaba055da76652b
authorJean-loup Gailly <jloup@gailly.net>
Thu, 21 Jul 2011 14:21:25 +0000 (21 16:21 +0200)
committerJean-loup Gailly <jloup@gailly.net>
Thu, 21 Jul 2011 14:21:25 +0000 (21 16:21 +0200)
treea6cf5b432269b94306381409b331879dab23157f
parent8743ea5ca7def209250011032670d74a1c86ba16
parent2fb32b94b848cf5aa2085ede6f5e5237b2ccd32c
Merge branch 'master' into greedy2