Merge 0.9->trunk
authorKim Alvefur <zash@zash.se>
Wed, 26 Dec 2012 19:35:40 +0000 (20:35 +0100)
committerKim Alvefur <zash@zash.se>
Wed, 26 Dec 2012 19:35:40 +0000 (20:35 +0100)
commit13e26026137097feed823b3782037a1d57e3ddd7
treebc1bf320b6b1c3bfeeca183836db75cff0a3bd28
parent43e8daa6636ade1914e918833cca374cfdbb01c3
parentf3c095a1e6d0916094c3e0021a43d087a0cb3c57
Merge 0.9->trunk