Merge 0.9->trunk
authorKim Alvefur <zash@zash.se>
Fri, 23 Nov 2012 16:17:02 +0000 (17:17 +0100)
committerKim Alvefur <zash@zash.se>
Fri, 23 Nov 2012 16:17:02 +0000 (17:17 +0100)
commitd631eea82c5144b9c2142b32affdb0ba4f878a43
treed4f229203d9a3b4dc12bfd11a7be36548e19dbd0
parenteccbcb3ea2047f1507510fce0ad8ad032f432fed
parentdc2ec682ee888187306eeaf9e5f8d832fbf47dbb
Merge 0.9->trunk