Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Wed, 26 Feb 2014 21:22:43 +0000 (22:22 +0100)
committerKim Alvefur <zash@zash.se>
Wed, 26 Feb 2014 21:22:43 +0000 (22:22 +0100)
commitf6894d7e9d7f13b206f9c3d6fb1bb232a1b625d5
tree6e0a242b350c2f5af2fa9d56791b39a74d3a0f5d
parent7b9d4b7a87c5d4ba95a75a691e22ecbd54e40070
parent80433ad5d309c052274d943269b6d56a7d45cea0
Merge 0.10->trunk