Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Thu, 20 Nov 2014 14:01:47 +0000 (15:01 +0100)
committerKim Alvefur <zash@zash.se>
Thu, 20 Nov 2014 14:01:47 +0000 (15:01 +0100)
commit45d601d5ebffdd8f41319bddcbeffb901ca5e967
treecdf57a98f24e22aa3d2282e366188a21aa9a8c54
parent3fffd83ee42e40bf647b8afa71d40ed409212200
parente1e1bd2dfa385b1003eb6ccbabda639ecb99114e
Merge 0.10->trunk