Merge 0.9->trunk
authorKim Alvefur <zash@zash.se>
Fri, 28 Dec 2012 02:03:56 +0000 (03:03 +0100)
committerKim Alvefur <zash@zash.se>
Fri, 28 Dec 2012 02:03:56 +0000 (03:03 +0100)
commit7775cae6dcb94e539c6c3cc8038db21b70997320
treefb562316fb4eac85948b30ab81428e6967ad351c
parent13e26026137097feed823b3782037a1d57e3ddd7
parent7b520ca0ad92fc646bb00010294ffb6a4d48cb02
Merge 0.9->trunk