Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Thu, 10 Apr 2014 14:52:03 +0000 (16:52 +0200)
committerKim Alvefur <zash@zash.se>
Thu, 10 Apr 2014 14:52:03 +0000 (16:52 +0200)
commitf862e1cfbe367f6b531763ead472e453aea525c4
tree8f244d119ff5ef43320d2d157a22b3196e0d9792
parentc78afc7a7acabaad191f978248e9b2bc25ecbc18
parent4b165d4800510fb51a9d4f039c7d16a8b7b7fd6b
Merge 0.10->trunk