Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Wed, 13 May 2015 22:24:21 +0000 (00:24 +0200)
committerKim Alvefur <zash@zash.se>
Wed, 13 May 2015 22:24:21 +0000 (00:24 +0200)
commitea3048793b75566baa155f4ee346594d2bba910b
tree84afb1e8ff3b0e90da88e287e6aa5e4f84e1e2bb
parent1505b14c1d10b539c1b38b90eaa0ef64e8c538b2
parent41977f3e683e553a2a96b23b467e2ac6b8c3cec3
Merge 0.10->trunk