Merge 0.9->trunk
authorKim Alvefur <zash@zash.se>
Sat, 23 Mar 2013 03:17:39 +0000 (04:17 +0100)
committerKim Alvefur <zash@zash.se>
Sat, 23 Mar 2013 03:17:39 +0000 (04:17 +0100)
commitb3006e740ec2fd5984b5d9a0884c59dd2665cf5a
tree9534c8d1113f3a3845c5221d870a65a9797fd49b
parent9186d6672f1abea2c7f984053b72d73a0db6561b
parent66bf0a695d2ec570c76431320e5e8c4bb21fb07d
Merge 0.9->trunk