Merge 0.9->0.10
authorKim Alvefur <zash@zash.se>
Sun, 11 Oct 2015 18:00:15 +0000 (20:00 +0200)
committerKim Alvefur <zash@zash.se>
Sun, 11 Oct 2015 18:00:15 +0000 (20:00 +0200)
commitb6d336cbfe79bf837dbf89f80d4852aa58a110c4
treed6e7cb530e428fa93e83dd5bc81c012cbf7a0114
parent912e11df55e84e974040f67846d11c61e99803e4
parent92d10b3198619b6b604091af635b165ecf2ac64a
Merge 0.9->0.10