Merge commit 'origin/4.6' into large-file-support
commit5ab96eb2df98bf7f0c8e7d7e676e548f15c2f4a3
authorJoão Abecasis <joao@abecasis.name>
Fri, 6 Nov 2009 10:55:39 +0000 (6 11:55 +0100)
committerJoão Abecasis <joao@abecasis.name>
Fri, 6 Nov 2009 10:55:39 +0000 (6 11:55 +0100)
tree006093748b4105232c6cc502e5b35216e90583c3
parentad3e723c334d72b746979b284910ac9b698b2d0b
parent0625bb69685d768891fe882b788d56285eb9a1ee
Merge commit 'origin/4.6' into large-file-support