Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sat, 26 Apr 2014 23:02:54 +0000 (01:02 +0200)
committerKim Alvefur <zash@zash.se>
Sat, 26 Apr 2014 23:02:54 +0000 (01:02 +0200)
commit2569be4197c0562e21856e749d46c7e425dbad72
treef2ba665d491fc8da23c700dcbb1ef1bfa6b12dc8
parent60e01b68a035fa076c03a639f5f62feb0220ed87
parentfcbcf2bab2c66ab3045d5de6d21ee56b164acb92
Merge 0.10->trunk