01/01: Merge branch 'master' into core-updates

[Marius Bakke]

mbakke pushed a commit to branch core-updates
in repository guix.

commit d156c999d0e7413696064992bb4a001d2d95317d
Merge: cc294bc 4c6c683
Author: Marius Bakke <address@hidden>
Date:   Thu Aug 10 00:18:36 2017 +0200

    Merge branch 'master' into core-updates

 gnu/packages/admin.scm |  4 ++--
 gnu/packages/curl.scm  | 28 ++++++++++++++++++++++++++++
 gnu/packages/samba.scm |  4 ++--
 3 files changed, 32 insertions(+), 4 deletions(-)

diff --cc gnu/packages/curl.scm
index af15aa3,d6e32e4..492a049
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@@ -40,7 -42,8 +42,8 @@@
  (define-public curl
    (package
     (name "curl")
+    (replacement curl-7.55.0)
 -   (version "7.53.0")
 +   (version "7.54.1")
     (source (origin
              (method url-fetch)
              (uri (string-append "https://curl.haxx.se/download/curl-";