Merge 0.9->trunk
authorKim Alvefur <zash@zash.se>
Fri, 28 Dec 2012 14:14:11 +0000 (15:14 +0100)
committerKim Alvefur <zash@zash.se>
Fri, 28 Dec 2012 14:14:11 +0000 (15:14 +0100)
commitd49c330ec2101b3e437d86756848527896455d53
treeb02d7e63e7ca26ed91a3ee270020184931d65403
parent234cde3e129d24942313efcc8956bdf06c155468
parentb65aa7ff48072c8fc25bd3c8064508130224ce05
Merge 0.9->trunk