Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sun, 11 May 2014 23:18:27 +0000 (01:18 +0200)
committerKim Alvefur <zash@zash.se>
Sun, 11 May 2014 23:18:27 +0000 (01:18 +0200)
commit6befcc43d228b38b23500ad93795bb6f21d208ec
tree9f5a3c40ed0b6dfbfdaf63c0e0c6f4ab56297a7c
parent899e1fd6cbe80b308f8d6f36d9f1b9cded7db44c
parentd176f4fe93486a96b7e55c0c94d5f06a1e46cdfc
Merge 0.10->trunk