Merge branch 'master' into staging
authorMarius Bakke <mbakke@fastmail.com>
Sun, 28 May 2017 21:47:25 +0000 (23:47 +0200)
committerMarius Bakke <mbakke@fastmail.com>
Sun, 28 May 2017 21:47:25 +0000 (23:47 +0200)
commit6f8cda185e3439777e1c3252cb3d75f0b19376fe
treedb8116ea8dfbf6ae490b9b3c220e6d9f67755d63
parent1622637bb74d03cd3070ce14195252ead032d99d
parent6c1db130a8a0cad4ff0c27f8f2e7274682a50ca4
Merge branch 'master' into staging
gnu/local.mk