Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Fri, 4 Jul 2014 21:05:27 +0000 (23:05 +0200)
committerKim Alvefur <zash@zash.se>
Fri, 4 Jul 2014 21:05:27 +0000 (23:05 +0200)
commit6c91101e5d303ba822d4f8b3c7a1e3ff3fb32376
tree327657d13488c42db77299665394b30423d436d1
parent3f52971196504ba5b5732a8887efcaf59038e13f
parentbaf426040d71b747f4e42b241a83baa6a49bf18b
Merge 0.10->trunk