Merge tag 'upstream/4.01.0' into experimental/master
authorStephane Glondu <steph@glondu.net>
Thu, 17 Oct 2013 09:40:06 +0000 (11:40 +0200)
committerStephane Glondu <steph@glondu.net>
Thu, 17 Oct 2013 09:40:06 +0000 (11:40 +0200)
commit0ca32296d8d93e8ab5d1cc52513ec8718c74589d
treef6b14ac47c4dcaa8495c2b6dec6c8c83d46d08b9
parenta1d58f93b40a0e6fab973924e2a67ce46a17b3c6
parentdf912e4b5d45ea9f8b9b54909bfdfb80fc9a0824
Merge tag 'upstream/4.01.0' into experimental/master

Upstream version 4.01.0