Merge tag 'upstream/4.00.0' into experimental/master
authorStephane Glondu <steph@glondu.net>
Fri, 27 Jul 2012 05:25:24 +0000 (07:25 +0200)
committerStephane Glondu <steph@glondu.net>
Fri, 27 Jul 2012 05:25:24 +0000 (07:25 +0200)
commit255e1c4d2622e0b4f2adfbe8cb12e2996d9b607c
tree3ae63bb2fc7af6612ce8dc3c4950f980b99117a0
parent11a1ff59b7ec8680c74018a92611c329af3be701
parente2a2eaed091ab112797e662a5ad77e9ffec491d0
Merge tag 'upstream/4.00.0' into experimental/master

Upstream version 4.00.0