Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sat, 22 Nov 2014 10:53:14 +0000 (11:53 +0100)
committerKim Alvefur <zash@zash.se>
Sat, 22 Nov 2014 10:53:14 +0000 (11:53 +0100)
commite89b852ba44f843cb37c1908892680580d9f18ff
tree3057e3c2e0f84e698ed6ec543c77dd7295225d8c
parent45d601d5ebffdd8f41319bddcbeffb901ca5e967
parent3ecbfc413e730a322e07dbb596362e511652fd33
Merge 0.10->trunk