Merge 0.9->trunk
authorKim Alvefur <zash@zash.se>
Sat, 15 Dec 2012 04:35:43 +0000 (05:35 +0100)
committerKim Alvefur <zash@zash.se>
Sat, 15 Dec 2012 04:35:43 +0000 (05:35 +0100)
commit6dd02707f647d626d957a05be38df4ee382c707e
treed51e85a0fda22423c0db10a29df86161578996c3
parent28e5e08829c07cfc046c914ef5093ed075299557
parent7de084492944ce8f00cdd8f473fc9a1e5fbb5ea6
Merge 0.9->trunk