Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Tue, 15 Apr 2014 19:54:44 +0000 (21:54 +0200)
committerKim Alvefur <zash@zash.se>
Tue, 15 Apr 2014 19:54:44 +0000 (21:54 +0200)
commitbed84ba3b6cd0ea823a6c086a4df6f9837e3c370
treedb6177756397125aa447aff46b83316ce47ee301
parent6d6261301364166dfe3f08dd22616d6bbcea024c
parentf1a6c158809cede48978944218aa7669dd5136e1
Merge 0.10->trunk