Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Fri, 8 Jan 2016 15:21:05 +0000 (16:21 +0100)
committerKim Alvefur <zash@zash.se>
Fri, 8 Jan 2016 15:21:05 +0000 (16:21 +0100)
commita8ed035a194773d87b973b9b4f1cae40c6ae5d8a
treeabe53c0a30a071b9ff91ca977019535042c45cf1
parent272ab3027651e4d326662b8ec5058edfe8ba93ea
parent260141cd70f380adba1104651b13cc1ea4b3c385
Merge 0.10->trunk