Merge branch 'version-0.12.0'
authorRicardo Wurmus <rekado@elephly.net>
Wed, 21 Dec 2016 22:33:18 +0000 (23:33 +0100)
committerRicardo Wurmus <rekado@elephly.net>
Wed, 21 Dec 2016 22:33:18 +0000 (23:33 +0100)
commit590b80d29a359d6dbaa3e1f5861e38572e077317
treee2a06024a154cda9d8457055cfbb3ed6a81a464d
parentd1f30631967826be56abf8b5f3f868a8c7ef7027
parent7af6ecab6e7b703de5fc3870bc34a8c8172efc53
Merge branch 'version-0.12.0'