Merge 0.10->trunk master
authorKim Alvefur <zash@zash.se>
Wed, 13 Jul 2016 16:43:33 +0000 (18:43 +0200)
committerKim Alvefur <zash@zash.se>
Wed, 13 Jul 2016 16:43:33 +0000 (18:43 +0200)
commit20260cb12d60f94955acecb6779e523611e22268
tree70bb7c1b4daa1fcadb8167d7d6a69bbdabda548e
parentbca35c227886965fb03723280c0fc79bdadb5faa
parenta6168c7337cc83c1c60f3e3f7b80f0bf9d7429d4
Merge 0.10->trunk