Commit graph

154 commits

Author SHA1 Message Date
Stefan Reichör
ef5c40aa2d
gnu: Add atool.
* gnu/packages/compression.scm (atool): New variable.

Co-authored-by: Ricardo Wurmus <rekado@elephly.net>
2017-10-18 23:08:39 +02:00
Marius Bakke
1c055d7258
Merge branch 'staging' 2017-10-10 21:44:32 +02:00
Tobias Geerinckx-Rice
16123d1dee
gnu: zstd: Update to 1.3.2.
* gnu/packages/compression.scm (zstd): Update to 1.3.2.
[source]: Remove snippet.
[license]: Add gpl2, gpl3+, and expat to the list.
2017-10-10 13:33:18 +02:00
Marius Bakke
7716ccd59c
Merge branch 'master' into staging 2017-10-05 00:45:38 +02:00
Theodoros Foradis
d109b1e85c
Update e-mail for Theodoros Foradis.
* .mailmap: Add entry.
* gnu/packages/aspell.scm: Replace theodoros.for@openmailbox.org with current address.
* gnu/packages/compression.scm: Likewise.
* gnu/packages/electronics.scm: Likewise.
* gnu/packages/engineering.scm: Likewise.
* gnu/packages/fpga.scm: Likewise.
* gnu/packages/graphviz.scm: Likewise.
* gnu/packages/guile.scm: Likewise.
* gnu/packages/libusb.scm: Likewise.
* gnu/packages/maths.scm: Likewise.
* gnu/packages/messaging.scm: Likewise.
* gnu/packages/uml.scm: Likewise.
* gnu/packages/wxwidgets.scm: Likewise.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2017-10-03 17:07:54 +02:00
Kei Kebreau
dc1d3cdef7
gnu: Use 'modify-phases' syntax.
* gnu/packages/admin.scm (mingetty, clusterssh, wpa-supplicant-minimal,
wpa-supplicant, wakelan, acpica, tree, direvent, dstat)[arguments]: Use
'modify-phases' syntax.
* gnu/packages/algebra.scm (arb)[arguments]: Likewise.
* gnu/packages/apr.scm (apr-util)[arguments]: Likewise.
* gnu/packages/audio.scm (clalsadrv, fluidsynth, faad2, lv2-mda-piano,
lv2-mda-epiano, timidity++, vamp, soundtouch, portaudio, rsound,
zita-convolver, zita-alsa-pcmi)[arguments]: Likewise.
* gnu/packages/backup.scm (rdup, btar)[arguments]: Likewise.
* gnu/packages/bioinformatics.scm (bedops, bwa, crossmap, express,
flexbar, grit, hisat, ngs-sdk, subread)[arguments]: Likewise.
* gnu/packages/bittorrent.scm (transmission)[arguments]: Likewise.
* gnu/packages/cdrom.scm (cd-discid)[arguments]: Likewise.
* gnu/packages/compression.scm (sharutils)[arguments]: Likewise.
* gnu/packages/conky.scm (conky)[arguments]: Likewise.
* gnu/packages/databases.scm (bdb, bdb-5.3)[arguments]: Likewise.
* gnu/packages/debug.scm (delta, c-reduce)[arguments]: Likewise.
* gnu/packages/display-managers.scm (slim)[arguments]: Likewise.
* gnu/packages/dns.scm (dnsmasq)[arguments]: Likewise.
* gnu/packages/emacs.scm (geiser, emacs-wget, bbdb)[arguments]: Likewise.
* gnu/packages/engineering.scm (pcb)[arguments]: Likewise.
* gnu/packages/firmware.scm (ath9k-htc-firmware)[arguments]: Likewise.
* gnu/packages/flashing-tools.scm (flashrom)[arguments]: Likewise.
* gnu/packages/fltk.scm (fltk)[arguments]: Likewise.
* gnu/packages/freedesktop.scm (python-pyxdg)[arguments]: Likewise.
* gnu/packages/gd.scm (perl-gd)[arguments]: Likewise.
* gnu/packages/gkrellm.scm (gkrellm)[arguments]: Likewise.
* gnu/packages/glib.scm (glibmm)[arguments]: Likewise.
* gnu/packages/gl.scm (glew)[arguments]: Likewise.
* gnu/packages/gnome.scm (icon-naming-utils, orbit2, libbonobo, gnome-vfs,
libgnome, libbonoboui, goffice-0.8, dconf)[arguments]: Likewise.
* gnu/packages/gprolog.scm (gprolog)[arguments]: Likewise.
* gnu/packages/gps.scm (gpscorrelate)[arguments]: Likewise.
* gnu/packages/graphics.scm (agg)[arguments]: Likewise.
* gnu/packages/gtk.scm (ganv, girara, gtksourceview-2, guile-present,
python2-pycairo)[arguments]: Likewise.
* gnu/packages/guile.scm (guile-1.8)[arguments]: Likewise.
* gnu/packages/guile-wm.scm (guile-wm)[arguments]: Likewise.
* gnu/packages/hugs.scm (hugs)[arguments]: Likewise.
* gnu/packages/hurd.scm (gnumach-headers, hurd-headers, hurd-minimal)
[arguments]: Likewise.
* gnu/packages/image-viewers.scm (feh, sxiv)[arguments]: Likewise.
* gnu/packages/libcanberra.scm (libcanberra)[arguments]: Likewise.
* gnu/packages/linux.scm (bridge-utils, iw, fuse, unionfs-fuse/static,
lm-sensors, i2c-tools, xsensors, perf, mdadm, libaio, module-init-tools)
[arguments]: Likewise.
* gnu/packages/lisp.scm (ccl)[arguments]: Likewise.
* gnu/packages/lout.scm (lout)[arguments]: Likewise.
* gnu/packages/lua.scm (luajit)[arguments]: Likewise.
* gnu/packages/machine-learning.scm (shogun)[arguments]: Likewise.
* gnu/packages/mail.scm (exim)[arguments]: Likewise.
* gnu/packages/man.scm (man-pages, txt2man)[arguments]: Likewise.
* gnu/packages/maths.scm (lapack, superlu-dist, openlibm, openspecfun)
[arguments]: Likewise.
* gnu/packages/messaging.scm (bitlbee)[arguments]: Likewise.
* gnu/packages/mp3.scm (libmad, id3lib, mp3info)[arguments]: Likewise.
* gnu/packages/music.scm (solfege)[arguments]: Likewise.
* gnu/packages/noweb.scm (noweb)[arguments]: Likewise.
* gnu/packages/patchutils.scm (patchutils, quilt, colordiff)[arguments]:
Likewise.
* gnu/packages/pdf.scm (xpdf, zathura-cb, zathura-ps, zathura-djvu,
zathura-pdf-poppler, zathura, podofo, fbida)[arguments]: Likewise.
* gnu/packages/perl.scm (perl-file-list, perl-test-harness)[arguments]:
Likewise.
* gnu/packages/photo.scm (gphoto2)[arguments]: Likewise.
* gnu/packages/popt.scm (popt)[arguments]: Likewise.
* gnu/packages/pretty-print.scm (source-highlight, astyle)[arguments]:
Likewise.
* gnu/packages/pumpio.scm (pumpa)[arguments]: Likewise.
* gnu/packages/python.scm (python-passlib, python-pycrypto, python2-empy,
python-sqlalchemy, python-docopt)[arguments]: Likewise.
* gnu/packages/rdf.scm (lrdf)[arguments]: Likewise.
* gnu/packages/regex.scm (tre)[arguments]: Likewise.
* gnu/packages/rrdtool.scm (rrdtool)[arguments]: Likewise.
* gnu/packages/ruby.scm (ruby-2.1, ruby-1.8)[arguments]: Likewise.
* gnu/packages/sawfish.scm (sawfish)[arguments]: Likewise.
* gnu/packages/scheme.scm (racket)[arguments]: Likewise.
* gnu/packages/sdl.scm (guile-sdl)[arguments]: Likewise.
* gnu/packages/serveez.scm (serveez)[arguments]: Likewise.
* gnu/packages/skribilo.scm (skribilo)[arguments]: Likewise.
* gnu/packages/smalltalk.scm (smalltalk)[arguments]: Likewise.
* gnu/packages/suckless.scm (dmenu, slock)[arguments]: Likewise.
* gnu/packages/tcl.scm (expect)[arguments]: Likewise.
* gnu/packages/telephony.scm (commoncpp)[arguments]: Likewise.
* gnu/packages/textutils.scm (recode, libgtextutils)[arguments]:
Likewise.
* gnu/packages/time.scm (time)[arguments]: Likewise.
* gnu/packages/tor.scm (privoxy)[arguments]: Likewise.
* gnu/packages/uucp.scm (uucp)[arguments]: Likewise.
* gnu/packages/video.scm (libdvdnav-4)[arguments]: Likewise.
* gnu/packages/web-browsers.scm (lynx)[arguments]: Likewise.
* gnu/packages/web.scm (tinyproxy)[arguments]: Likewise.
* gnu/packages/wicd.scm (wicd)[arguments]: Likewise.
* gnu/packages/wm.scm (bspwm)[arguments]: Likewise.
* gnu/packages/xdisorg.scm (sxhkd, xcape)[arguments]: Likewise.
* gnu/packages/xfce.scm (xfconf)[arguments]: Likewise.
* gnu/packages/xfig.scm (transfig)[arguments]: Likewise.
* gnu/packages/xorg.scm (imake)[arguments]: Likewise.
2017-09-20 20:58:04 -04:00
Marius Bakke
58366883f2
Merge branch 'master' into staging 2017-09-20 18:49:26 +02:00
Efraim Flashner
56bf42fb40
gnu: libzip: Fix building on 32-bit architectures.
* gnu/packages/compression.scm (libzip)[arguments]: New field, add phase
to skip tests which are known to have issues on 32-bit architectures.
2017-09-15 15:19:42 +03:00
Efraim Flashner
98df3a88b5
gnu: libzip: Update to 1.3.0 (fixes CVE-2017-14107).
* gnu/packages/compression.scm (libzip): Update to 1.3.0.
[source]: Remove patch.
[arguments]: Remove custom 'patch-perl phase.
* gnu/packages/patches/libzip-CVE-2017-12858.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Remove it.
2017-09-06 14:20:43 +03:00
Marius Bakke
a76585e553
Merge branch 'master' into staging 2017-09-04 22:34:28 +02:00
Kei Kebreau
d10092b849
gnu: Put autoconf-related phases immediately after the 'unpack phase.
* gnu/packages/audio.scm (audacity, rtmidi)[arguments]: Correct phases
accordingly.
* gnu/packages/bioinformatics.scm (mash, seek, vsearch, emboss,
htslib-for-sambamba)[arguments]: Likewise.
* gnu/packages/ci.scm (cuirass)[arguments]: Likewise.
* gnu/packages/compression.scm (minizip, xdelta)[arguments]: Likewise.
* gnu/packages/cpp.scm (libzen)[arguments]: Likewise.
* gnu/packages/crypto.scm (opendht)[arguments]: Likewise.
* gnu/packages/databases.scm (4store, mdbtools)[arguments]: Likewise.
* gnu/packages/debug.scm (stress-make)[arguments]: Likewise.
* gnu/packages/dns.scm (dnscrypt-proxy, dnscrypt-wrapper)[arguments]:
Likewise.
* gnu/packages/emacs.scm (emacs-pdf-tools)[arguments]: Likewise.
* gnu/packages/embedded.scm (libjaylink, openocd)[arguments]: Likewise.
* gnu/packages/engineering.scm (gerbv)[arguments]: Likewise.
* gnu/packages/erlang.scm (erlang)[arguments]: Likewise.
* gnu/packages/ftp.scm (weex)[arguments]: Likewise.
* gnu/packages/gnome.scm (dia)[arguments]: Likewise.
* gnu/packages/gnunet.scm (gnurl, guile-gnunet)[arguments]: Likewise.
* gnu/packages/gtk.scm (guile-rsvg, graphene)[arguments]: Likewise.
* gnu/packages/guile.scm (guildhall, guile-ics, guile-sqlite3)[arguments]:
Likewise.
* gnu/packages/ibus.scm (ibus-libpinyin)[arguments]: Likewise.
* gnu/packages/irc.scm (weechat)[arguments]: Likewise.
* gnu/packages/java.scm (classpath-devel)[arguments]: Likewise.
* gnu/packages/libreoffice.scm (libetonyek)[arguments]: Likewise.
* gnu/packages/libusb.scm (hidapi)[arguments]: Likewise.
* gnu/packages/linux.scm (gpm)[arguments]: Likewise.
* gnu/packages/logging.scm (glog)[arguments]: Likewise.
* gnu/packages/machine-learning.scm (ghmm)[arguments]: Likewise.
* gnu/packages/mail.scm (dovecot-trees, dovecot-libsodium-plugin, esmtp)
[arguments]: Likewise.
* gnu/packages/messaging.scm (freetalk, libmesode, libstrophe)[arguments]:
Likewise.
* gnu/packages/microcom.scm (microcom)[arguments]: Likewise.
* gnu/packages/ocaml.scm (ocaml-ssl)[arguments]: Likewise.
* gnu/packages/parallel.scm (slurm)[arguments]: Likewise.
* gnu/packages/pdf.scm (libharu)[arguments]: Likewise.
* gnu/packages/samba.scm (cifs-utils)[arguments]: Likewise.
* gnu/packages/serialization.scm (msgpack)[arguments]: Likewise.
* gnu/packages/shells.scm (scsh)[arguments]: Likewise.
* gnu/packages/telephony.scm (libiax2)[arguments]: Likewise.
* gnu/packages/textutils.scm (dotconf)[arguments]: Likewise.
* gnu/packages/version-control.scm (findnewest)[arguments]: Likewise.
* gnu/packages/video.scm (libmediainfo, mediainfo)[arguments]: Likewise.
2017-09-04 00:10:59 -04:00
Marius Bakke
30dfac27a5
Merge branch 'master' into staging 2017-09-02 15:57:56 +02:00
Marius Bakke
2ec339c25a
Revert "gnu: lzip: Update to 1.19."
This reverts commit 0963e3e450.
2017-09-02 15:50:17 +02:00
Ricardo Wurmus
e7c76b0661
gnu: Add python-lzstring.
* gnu/packages/compression.scm (python-lzstring, python2-lzstring): New
variables.
2017-08-30 17:31:59 +02:00
Kei Kebreau
3c8ba11a97
Update e-mail for Kei Kebreau.
* .mailmap: Map kei@openmailbox.org to current address.
* gnu/local.mk: Replace kei@openmailbox.org to current address.
* gnu/packages/backup.scm: Likewise.
* gnu/packages/calendar.scm: Likewise.
* gnu/packages/check.scm: Likewise.
* gnu/packages/compression.scm: Likewise.
* gnu/packages/documentation.scm: Likewise.
* gnu/packages/emacs.scm: Likewise.
* gnu/packages/fltk.scm: Likewise.
* gnu/packages/freedesktop.scm: Likewise.
* gnu/packages/game-development.scm: Likewise.
* gnu/packages/games.scm: Likewise.
* gnu/packages/gnome.scm: Likewise.
* gnu/packages/gnustep.scm: Likewise.
* gnu/packages/gtk.scm: Likewise.
* gnu/packages/hexedit.scm: Likewise.
* gnu/packages/image.scm: Likewise.
* gnu/packages/maths.scm: Likewise.
* gnu/packages/music.scm: Likewise.
* gnu/packages/xfce.scm: Likewise.
* gnu/packages/python.scm: Likewise.
* gnu/packages/tcl.scm: Likewise.
* gnu/packages/textutils.scm: Likewise.
* gnu/packages/video.scm: Likewise.
* gnu/packages/w3m.scm: Likewise.
* gnu/packages/web.scm: Likewise.
* gnu/packages/web-browsers.scm: Likewise.
* gnu/packages/patches/wmfire-update-for-new-gdk-versions.patch: Likewise.
2017-08-29 20:13:24 -04:00
Leo Famulari
9baa969758
gnu: libzip: Fix CVE-2017-12858.
* gnu/packages/patches/libzip-CVE-2017-12858.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/compression.scm (libzip)[source]: Use it.
2017-08-27 19:51:45 -04:00
Marius Bakke
4028fd395e
Merge branch 'master' into staging 2017-08-26 15:34:29 +02:00
Marius Bakke
72e2815d18
Merge branch 'core-updates' 2017-08-26 15:15:49 +02:00
Tobias Geerinckx-Rice
46057c0a3f
gnu: zstd: Update to 1.3.1.
* gnu/packages/compression.scm (zstd): Update to 1.3.1.
2017-08-21 17:38:07 +02:00
Marius Bakke
2718a9cd09
Merge branch 'master' into core-updates 2017-08-21 02:40:37 +02:00
Tobias Geerinckx-Rice
b7585ca3b9
gnu: lz4: Update to 1.8.0.
* gnu/packages/compression.scm (lz4): Update to 1.8.0.  Fix typo in comment.
[source]: Remove patch.
* gnu/packages/patches/lz4-fix-test-failures.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
2017-08-19 02:17:42 +02:00
Tobias Geerinckx-Rice
00d9124d40
gnu: lz4: Use recommended home page.
* gnu/packages/compression.scm (lz4)[home-page]: Use lz4.org.
2017-08-19 02:17:42 +02:00
Tobias Geerinckx-Rice
0963e3e450
gnu: lzip: Update to 1.19.
* gnu/packages/compression.scm (lzip): Update to 1.19.
[description]: Fix minor typo.
2017-08-18 15:08:25 +02:00
Marius Bakke
9fa0c0e6fa
gnu: libmspack: Update to 0.6 [fixes CVE-2017-{6419,11423}].
* gnu/packages/compression.scm (libmspack): Update to 0.6.
2017-08-17 22:32:51 +02:00
Mark H Weaver
f167595ba1
Merge branch 'master' into core-updates 2017-08-06 00:23:20 -04:00
Tobias Geerinckx-Rice
b316caaa9c
gnu: python-lz4: Fix typo in synopsis.
* gnu/packages/compression.scm (python-lz4)[synopsis]: Fix typo.
2017-08-04 05:00:26 +02:00
Tobias Geerinckx-Rice
e9f6a935fb
gnu: python-lz4: Update to 0.10.1.
* gnu/packages/compression.scm (python-lz4): Update to 0.10.1.
[native-inputs]: Add python-setuptools-scm.
2017-08-04 04:59:48 +02:00
Marius Bakke
e0b9e377f1
Merge branch 'master' into core-updates 2017-07-28 00:34:13 +02:00
Tobias Geerinckx-Rice
9d9fc39946
gnu: Add lziprecover.
* gnu/packages/compression.scm (lziprecover): New variable.
2017-07-26 19:38:59 +02:00
Leo Famulari
c8eb2b8c60
Merge branch 'master' into core-updates 2017-07-10 14:37:53 -04:00
Manolis Ragkousis
a5fa1a1a54
gnu: unshield: Remove incorrect '"'.
* gnu/packages/compression.scm (unshield): Remove incorrect '"'.
2017-07-10 17:13:02 +03:00
Tobias Geerinckx-Rice
08094dc926
gnu: zstd: Update to 1.3.0.
* gnu/packages/compression.scm (zstd): Update to 1.3.0.
2017-07-06 01:28:05 +02:00
Mark H Weaver
ed068b960e
Merge branch 'master' into core-updates 2017-06-26 00:00:58 -04:00
Theodoros Foradis
06de4aaf1e
gnu: Add libzip.
* gnu/packages/compression.scm (libzip): New variable.

Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
2017-06-24 07:46:03 +02:00
Arun Isaac
148585c240
gnu: Move contents of zip module into compression module.
* gnu/packages/zip.scm (zip, unzip, zziplib, perl-zip): Move to...
* gnu/packages/compression.scm: ...here.
* gnu/packages/zip.scm: Delete file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Unregister deleted file.
* po/packages/POTFILES.in: Unregister deleted file.
* gnu/packages/{audio, avr, bioinformatics, busybox, cdrom, ci, compression,
docbook, documentation, fonts, fpga, game-development, games, gl, gnome,
gnuzilla, graphics, guile, haskell, image, java, kodi, ldc, libreoffice,
markup, maths, mc, monitoring, music, php, pretty-print, python, scheme,
smalltalk, statistics, synergy, tex, textutils, video, web-browsers, xml,
zip}.scm, guix/build-system/{ant, font}.scm, guix/{download, packages}.scm:
Adapt module import.
2017-06-20 18:10:35 +05:30
Leo Famulari
9f825cec1b
Merge branch 'master' into core-updates 2017-06-04 14:56:31 -04:00
Manolis Ragkousis
9e6ada8f87
gnu : Add unshield.
* gnu/packages/compression.scm (unshield): New variable.
2017-06-04 18:07:45 +03:00
Ricardo Wurmus
d1a914082b
Merge branch 'master' into core-updates 2017-05-24 12:05:47 +02:00
Christopher Baines
e7ee50f2d2
gnu: bzip2: Patch bzip2 utilities.
* gnu/packages/compression.scm (bzip2)[arguments]: Add patch-script phase to
  remove absolute reference to /bin/rm.

Signed-off-by: Marius Bakke <mbakke@fastmail.com>
2017-05-17 16:57:05 +02:00
Christopher Baines
03bc86b8f4
gnu: bzip2: Use 'modify-phases' syntax.
* gnu/packages/compression.scm (bzip2)[arguments]: Use 'modify-phases' syntax.

Signed-off-by: Marius Bakke <mbakke@fastmail.com>
2017-05-17 16:56:53 +02:00
Tobias Geerinckx-Rice
6bd7d164a7
gnu: zstd: Update to 1.2.0.
* gnu/packages/compression.scm (zstd): Update to 1.2.0.
2017-05-05 14:18:48 +02:00
Petter
2f3108ad03
gnu: Avoid circular dependencies by Perl license.
* guix/licenses.scm (perl-license): New variable.
* gnu/packages/bioinformatics.scm: Change (package-license perl) to perl-license.
* gnu/packages/compression.scm: Same.
* gnu/packages/databases.scm: Same.
* gnu/packages/gd.scm: Same.
* gnu/packages/language.scm: Same.
* gnu/packages/libevent.scm: Same.
* gnu/packages/mail.scm: Same.
* gnu/packages/messaging.scm: Same.
* gnu/packages/ncurses.scm: Same.
* gnu/packages/networking.scm: Same.
* gnu/packages/photo.scm: Same.
* gnu/packages/tcl.scm: Same.
* gnu/packages/tex.scm: Same.
* gnu/packages/tls.scm: Same.
* gnu/packages/web.scm: Same.
* gnu/packages/wm.scm: Same.
* gnu/packages/xml.scm: Same.
* gnu/packages/xorg.scm: Same.
* gnu/packages/zip.scm: Same.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2017-05-02 23:41:14 +02:00
Leo Famulari
b496bfea41
gnu: lz4: Update to 1.7.5.
* gnu/packages/compression.scm (lz4): Update to 1.7.5.
[source]: Update source URL. Use patch 'lz4-fix-test-failures.patch'.
[home-page]: Update URL.
* gnu/packages/patches/lz4-fix-test-failures.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
2017-04-08 15:36:53 -04:00
Marius Bakke
28938febd5
gnu: lzip: Correct hash.
This is a followup to dede644945.

* gnu/packages/compression.scm (lzip)[source]: Use hash of ".gz" tarball
instead of ".lz".
2017-04-03 16:07:28 +02:00
Marius Bakke
dede644945
gnu: lzip: Update to 1.18.
* gnu/packages/compression.scm (lzip): Update to 1.18.
2017-04-03 15:35:09 +02:00
Marius Bakke
84157bb8bf
Merge branch 'master' into core-updates
Most conflicts are from 6fd52309b8.
2017-03-30 22:59:53 +02:00
Tobias Geerinckx-Rice
6fd52309b8
gnu: Use HTTPS for almost all gnu.org HOME-PAGEs.
All HTTP gnu.org (and supported subdomain) HOME-PAGEs changed to HTTPS.
2017-03-30 01:30:16 +02:00
Tobias Geerinckx-Rice
dbaca6b507
gnu: zstd: Update to 1.1.4.
* gnu/packages/compression.scm (zstd): Update to 1.1.4.
2017-03-29 22:05:59 +02:00
Marius Bakke
ad31b4febf
Revert "gnu: snappy: Update to 1.1.4."
Rocksdb fails to build with this version:
https://github.com/facebook/rocksdb/issues/1947

This reverts commit 9baab9aeed.
2017-03-28 15:54:11 +02:00
Efraim Flashner
0371b345e8
Merge remote-tracking branch 'origin/master' into core-updates 2017-03-23 14:53:33 +02:00