Merge 0.9->trunk
authorKim Alvefur <zash@zash.se>
Sat, 29 Dec 2012 18:13:42 +0000 (19:13 +0100)
committerKim Alvefur <zash@zash.se>
Sat, 29 Dec 2012 18:13:42 +0000 (19:13 +0100)
commitb95dff1c3fef7a842c9ec30d924c33370dc0ffa9
tree05923cf895cd219bf4ecb794fc1f72a0fc2e5791
parentd49c330ec2101b3e437d86756848527896455d53
parent906cd70922c331e359ddf60f452394f0caef7ae3
Merge 0.9->trunk