Merge branch 'master' into core-updates
authorMarius Bakke <mbakke@fastmail.com>
Wed, 9 Aug 2017 22:18:36 +0000 (00:18 +0200)
committerMarius Bakke <mbakke@fastmail.com>
Wed, 9 Aug 2017 22:18:36 +0000 (00:18 +0200)
commitd156c999d0e7413696064992bb4a001d2d95317d
treea525ac1e71ef638ad5b1819feb151665be7cda97
parentcc294bcee6bfaa4524ac43450e41f083539f9cb1
parent4c6c683862579b9f1fa6782b9482054eb1059225
Merge branch 'master' into core-updates
gnu/packages/admin.scm
gnu/packages/curl.scm