Merge tag 'upstream/4.02.2_rc1' into experimental/master
authorStephane Glondu <steph@glondu.net>
Fri, 12 Jun 2015 14:23:55 +0000 (16:23 +0200)
committerStephane Glondu <steph@glondu.net>
Fri, 12 Jun 2015 14:23:55 +0000 (16:23 +0200)
commit7827dd1f6c25e5671b60018fb0ffabb5a613c9f2
tree47c19ae03de1303900037062063fc72db7c79d43
parent344cb6f9369f1403d84daf277df4662d685ffaa8
parentb4487092fcc7bc534956f23f47e96303d1a90ba8
Merge tag 'upstream/4.02.2_rc1' into experimental/master

Upstream version 4.02.2~rc1