Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sun, 28 Feb 2016 18:27:13 +0000 (19:27 +0100)
committerKim Alvefur <zash@zash.se>
Sun, 28 Feb 2016 18:27:13 +0000 (19:27 +0100)
commita243bf2c3e71340c72be7a2910fd2f60a08bd521
tree1f1709386407df86b225f0e9cf0eef8ab98e208f
parent0406b86d16ce8e4121c880c2b5a4dff07c0e1bc0
parent89be8bc9e2d3a0c49f5cb2e893eb72e8a9743401
Merge 0.10->trunk