Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Fri, 3 Apr 2015 04:39:28 +0000 (06:39 +0200)
committerKim Alvefur <zash@zash.se>
Fri, 3 Apr 2015 04:39:28 +0000 (06:39 +0200)
commit52de3bed26f3c79620cbdef4381b3bf935e305e6
tree2edb920eb2a12811781064e06f88608332c52f6f
parent1660fff603b4409c89e32109f5b39f7ceb28e94e
parent2c930e1b1f028ccdd367d4c072f909ac6a14949c
Merge 0.10->trunk