Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sat, 19 Mar 2016 21:46:41 +0000 (22:46 +0100)
committerKim Alvefur <zash@zash.se>
Sat, 19 Mar 2016 21:46:41 +0000 (22:46 +0100)
commit8fb6335ec4d18c4185c216ea425fa3abe89301bb
tree00933bc73d0c233d2cf82d2e9eec5dbb92437376
parent155b53a0ca5b6c7ed484a142bb4e9fed1a2636cd
parenta03fd32eac866e402fec78253d7e2ba6b3710d69
Merge 0.10->trunk