Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Mon, 3 Feb 2014 06:25:05 +0000 (07:25 +0100)
committerKim Alvefur <zash@zash.se>
Mon, 3 Feb 2014 06:25:05 +0000 (07:25 +0100)
commit6ad614c5005f1c30ff4301b6e996674ca1c1c9ef
treedd68df4b86328f67a485960f2fcdd901987b3046
parent548f3fecbe593bd11ffdf6758ea3ea37fa226761
parent889f84baf074e558f8189b8a8ba064f5ce96a94d
Merge 0.10->trunk