Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sat, 17 Oct 2015 17:31:43 +0000 (19:31 +0200)
committerKim Alvefur <zash@zash.se>
Sat, 17 Oct 2015 17:31:43 +0000 (19:31 +0200)
commit28c63835bdf4bfc9a8d79abba45f726caf320bb5
tree25dd936679e01e00d0220fbbf08ce15bd9f3ace2
parent79a152bb61900a86c486b62d59be60fa845f8afc
parentb814906935e8f6cc1a2a6fdea4e5e725cec57ead
Merge 0.10->trunk