Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Wed, 3 Feb 2016 22:02:36 +0000 (23:02 +0100)
committerKim Alvefur <zash@zash.se>
Wed, 3 Feb 2016 22:02:36 +0000 (23:02 +0100)
commitdc2e63e570a7722295dfe119ede0c3ffbb9ee5bc
tree248e8447302fdabcff8df1c9fecad3dc1bed9d06
parent981bcb049ea6d9ac780c69aec78040931fde265f
parent75b63613103fe01f65999d1f8302b6e1a0ddfe1f
Merge 0.10->trunk