Merge branch 'master' into derm8
commitc00109bd93b297797557d588a98930a132f785a0
authorJean-loup Gailly <jloup@gailly.net>
Mon, 8 Aug 2011 09:04:30 +0000 (8 11:04 +0200)
committerJean-loup Gailly <jloup@gailly.net>
Mon, 8 Aug 2011 09:04:30 +0000 (8 11:04 +0200)
treef22c69126da319198fdfe1d1d0ebceacd0a4dd65
parent6f996b193400195c651c2d5a9cc1b721d979ad39
parent1eaef13587fb1e5b2568b6ecb803201cf4ea14d2
Merge branch 'master' into derm8