Merge 0.9->0.10
authorKim Alvefur <zash@zash.se>
Sun, 24 Nov 2013 13:24:21 +0000 (14:24 +0100)
committerKim Alvefur <zash@zash.se>
Sun, 24 Nov 2013 13:24:21 +0000 (14:24 +0100)
commit8bb2078fbc4e0db14429616a71d17dec966a749a
tree7b91952044981a3a75a4ccfba81b71526d5916c2
parentc2d1256b5aacf7e891c161773edffb08220dfa3f
parentc05bf279c97accb6fc719d7490e5519f073d08d9
Merge 0.9->0.10