Merge branch 'v5.0' origin/HEAD origin/master
authorLasse Collin <lasse.collin@tukaani.org>
Mon, 15 Nov 2010 12:33:01 +0000 (14:33 +0200)
committerLasse Collin <lasse.collin@tukaani.org>
Mon, 15 Nov 2010 12:33:01 +0000 (14:33 +0200)
commit7c24e0d1b8a2e86e9263b0d56d39621e01aed7af
tree6347dd642bef2643c0f13c986068bf93c6f263ec
parentb4d42f1a7120e2cefeb2f14425efe2ca6db85416
parent3e564704bc6f463cb2db11e3f3f0dbd71d85992e
Merge branch 'v5.0'