Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Fri, 1 Jan 2016 22:31:13 +0000 (23:31 +0100)
committerKim Alvefur <zash@zash.se>
Fri, 1 Jan 2016 22:31:13 +0000 (23:31 +0100)
commit8c59c98e31eef9993c8735ad8b5e9c2209e30c1c
tree06a717cf3269aa0c08f2707b43571fd2c1f691c3
parent9b53917789f122e1aa8a8dc2eb62c3c5fbd49267
parente598b17d481a32b884a97d1de28313f943cd7db8
Merge 0.10->trunk