Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Fri, 25 Jul 2014 19:16:52 +0000 (21:16 +0200)
committerKim Alvefur <zash@zash.se>
Fri, 25 Jul 2014 19:16:52 +0000 (21:16 +0200)
commit21c1541fb77110bb33debbdaec57a6c5820a31e7
tree4f828268bec41845e6cdd49cf138e255ce3959b0
parent3f385f69e972cb7216fdd34603625575491bfe86
parent723d0fe9fce5142b40f67dc89b8a29020e74ca09
Merge 0.10->trunk