Merge branch 'core-updates'

diff --cc gnu-system.am
Simple merge

diff --cc gnu/packages/compression.scm
index 0f27fa9,7d22095..4a31bf7
--- 1/gnu/packages/compression.scm
--- 2/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@@ -7,8 -7,7 +7,8 @@@
  ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
  ;;; Copyright © 2015 Leo Famulari <leo@famulari.name>
  ;;; Copyright © 2015 Jeff Mickey <j@codemac.net>
- ;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il>
+ ;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il>
 +;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;

diff --cc gnu/packages/ruby.scm
Simple merge

diff --cc gnu/packages/tls.scm
Simple merge

diff --cc gnu/packages/web.scm
Simple merge