Merge branch 'v5.0'
commit4f2c69a4e3e0aee2e37b0b1671d34086e20c8ac6
authorLasse Collin <lasse.collin@tukaani.org>
Sun, 12 Dec 2010 21:13:22 +0000 (12 23:13 +0200)
committerLasse Collin <lasse.collin@tukaani.org>
Sun, 12 Dec 2010 21:13:22 +0000 (12 23:13 +0200)
treed9d5d9713bc0f868506c0830da45535c825ed5ab
parentadb89e68d43a4cadb0c215b45ef7a75737c9c3ec
parent9311774c493c19deab51ded919dcd2e9c4aa2829
Merge branch 'v5.0'