Merge 0.9 -> trunk (like this?)
authorKim Alvefur <zash@zash.se>
Fri, 28 Sep 2012 23:05:17 +0000 (01:05 +0200)
committerKim Alvefur <zash@zash.se>
Fri, 28 Sep 2012 23:05:17 +0000 (01:05 +0200)
commit5b982fb9673d347746533db2d2f0cbbc69547f36
treec3879a0399f158087face0607a61f0bece75196d
parentb1874e278503b55740a2b1826651dbf61bfaf753
parent532b263cb6cf6b83e507e5002334e17c475e618e
Merge 0.9 -> trunk (like this?)