Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Thu, 10 Apr 2014 11:16:54 +0000 (13:16 +0200)
committerKim Alvefur <zash@zash.se>
Thu, 10 Apr 2014 11:16:54 +0000 (13:16 +0200)
commitc78afc7a7acabaad191f978248e9b2bc25ecbc18
tree1745de4f6d9c8bc0aa25c238238f6a6984086f3d
parent701fa72ca55909888b3fd428724128c654d8b543
parent0f16692963e73a392fb9fc930e3dd02373c3a6e3
Merge 0.10->trunk