Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Fri, 5 Feb 2016 15:31:34 +0000 (16:31 +0100)
committerKim Alvefur <zash@zash.se>
Fri, 5 Feb 2016 15:31:34 +0000 (16:31 +0100)
commit16831ca1b5cc86d2ee94b49d79c58037ed920a53
tree3bc7a1d5211477b767b4236669eb597155c0f3f4
parent3ae195e67a451f2b089f9c6ece5c517349f85c15
parent483a94f7f5d1289dcb1934643d70b8bf98870329
Merge 0.10->trunk