Merge tag 'upstream/0.9.5' into unstable
authorJelmer Vernooij <jelmer@jelmer.uk>
Mon, 18 Apr 2016 17:39:04 +0000 (17:39 +0000)
committerJelmer Vernooij <jelmer@jelmer.uk>
Mon, 18 Apr 2016 17:39:04 +0000 (17:39 +0000)
commit9b953dff18b4df3a5cbc9794a3c4bf1430395e74
treee86bd99e010c50cefe2a11bfcfe2597c5636c123
parent39137a0f21aca2f403680909a1a1ed79774f58e7
parent3859165aeb1876e47af7826a33b8a16a44e05e75
Merge tag 'upstream/0.9.5' into unstable

Upstream version 0.9.5