Merge tag 'upstream/4.02.1' into experimental/master
authorStephane Glondu <steph@glondu.net>
Tue, 21 Oct 2014 09:41:03 +0000 (11:41 +0200)
committerStephane Glondu <steph@glondu.net>
Tue, 21 Oct 2014 09:41:03 +0000 (11:41 +0200)
commitacb349918dcc9bc48a38e6b5c2281b2ccde25d91
treedf7f445910f5bac7eec9291fe8195cc4666af8db
parent61b7354f230caa30ea5bbaed635b7a0a927df514
parentb92f950defa3bd03db8075caef1d4179447822f4
Merge tag 'upstream/4.02.1' into experimental/master

Upstream version 4.02.1