Merge branch 'unstable' v0.2.26
authorSalim Fadhley <sal@stodge.org>
Tue, 13 Jan 2015 22:25:23 +0000 (22:25 +0000)
committerSalim Fadhley <sal@stodge.org>
Tue, 13 Jan 2015 22:25:23 +0000 (22:25 +0000)
commit355b691952ae4dd9e14cb018d398b04bc442a368
tree8cfb387684b8f510613ce3b23ded352557cb0524
parentc15651ddb02a2fa4f6620e3c0bde204a93fe34b9
parent5b27baf534f5b51c0c1f8492183170104a559fa2
Merge branch 'unstable'