Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sun, 24 Nov 2013 13:24:53 +0000 (14:24 +0100)
committerKim Alvefur <zash@zash.se>
Sun, 24 Nov 2013 13:24:53 +0000 (14:24 +0100)
commit51f656779c1b9d9ea7373d1f56268fd9e23ab06f
tree7aad12d44abcb5518f1f9a1934b65cb3069f1bbd
parent8bb2078fbc4e0db14429616a71d17dec966a749a
parentd907474c5a01b3def4f6961de98cd4e96244be2c
Merge 0.10->trunk