Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Mon, 30 Jun 2014 11:12:16 +0000 (13:12 +0200)
committerKim Alvefur <zash@zash.se>
Mon, 30 Jun 2014 11:12:16 +0000 (13:12 +0200)
commit3f52971196504ba5b5732a8887efcaf59038e13f
treedf95365f14247fb9921c08322ff3d0af9c48e327
parenta19342364ae76c7e7e8bccea43fd12df73c06b4d
parente381f159ff44b9f8d89fe93d8cc525c4d839e9ef
Merge 0.10->trunk