Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sat, 16 Jan 2016 21:44:43 +0000 (22:44 +0100)
committerKim Alvefur <zash@zash.se>
Sat, 16 Jan 2016 21:44:43 +0000 (22:44 +0100)
commitb564225035d20ba51ceff9f628635f42a4d68d98
tree0f6cc3f0069df1867992b8399b55b46643389f98
parent12cc943f42a72356e70469fa4ded1dbe892bf4b4
parentb62dc0ecabc8bf83976faf05c877e6f3bf426c43
Merge 0.10->trunk