Pascal Wittmann
2f309854ef
Merge pull request #22622 from hrdinka/add/attract-mode
...
attract-mode: init at 2.2.0
2017-02-10 14:12:59 +01:00
Christoph Hrdinka
de9720b65f
aqemu: init at 0.9.2
2017-02-10 12:48:29 +01:00
Christoph Hrdinka
95ee742dcd
attract-mode: init at 2.2.0
2017-02-10 12:25:26 +01:00
Christoph Hrdinka
d04ee2f91c
libretro: add reicast core
2017-02-10 12:11:29 +01:00
Carles Pagès
4059a29394
Merge pull request #22512 from paperdigits/dateutils
...
dateutils: init at 0.4.1
2017-02-10 11:55:15 +01:00
Frederik Rietdijk
81d0494390
jsonnet: use emscripten build against python2
2017-02-10 09:35:22 +01:00
Remy Goldschmidt
176a96782e
pdf2htmlEX: init at 0.14.6 ( #22480 )
2017-02-10 07:10:16 +01:00
Charles Strahan
4ca258e97a
Merge pull request #22490 from cstrahan/ycmd
...
ycmd: 2016-01-12 -> 2017-02-03
2017-02-10 01:09:56 -05:00
Charles Strahan
53a5117cde
ycmd: use vendored python libs
...
YouCompleteMe needs the packages to be available in ycmd's third_party
directory, and things start getting pretty complicated when we try to
use our package libs instead of the vendored ones. We can revisit this
at a later time, but we'll need to ensure that we don't break the vim
plugin.
Tested in vim.
2017-02-10 01:01:22 -05:00
Dan Peebles
03cab2d923
ecs-agent: init at 1.14.0
2017-02-10 04:33:48 +00:00
Herwig Hochleitner
742db3fd84
pypy: enable dbm support in db dependency
...
fixes test breakage introduced by #21049 dca3a4e3f4
2017-02-10 03:56:16 +01:00
Adam Beckmeyer
4000489266
olm: init at 2.2.1
2017-02-10 02:22:15 +01:00
Joachim F
ca8fb930b1
Merge pull request #22356 from Ekleog/redsocks
...
Redsocks
2017-02-09 22:39:43 +01:00
Daniel Peebles
7439fe083f
Merge pull request #22297 from nand0p/buildbot-0.9.3
...
buildbot: 0.9.0.post1 -> 0.9.3
2017-02-09 11:15:03 -05:00
Peter Hoeg
7c435a82ce
dropbox: works with qt 5.6
2017-02-09 15:49:27 +01:00
Stefan Siegl
f800a4b197
tomboy: init at 1.15.7 ( #22589 )
2017-02-09 14:17:35 +00:00
Jörg Thalheim
f3c6acde1e
Merge pull request #22572 from Mic92/dwarfdump
...
dwarfdump: init at 20161124
2017-02-09 12:00:18 +01:00
Mica Semrick
70a7fe9d03
dateutils: init at 0.4.1
2017-02-08 19:31:31 -08:00
John Ericson
e74ec9d84f
Merge pull request #22575 from Ericson2314/localSystem
...
top-level: Allow nixpkgs to take localSystem directly
2017-02-08 22:10:49 -05:00
John Ericson
8cd4c31d6b
top-level: Allow nixpkgs to take localSystem directly
...
This is instead of both system and platform, which is kind of ugly.
2017-02-08 22:06:57 -05:00
Franz Pletz
dced724c00
linux_3_18: remove due to EOL
2017-02-08 23:50:59 +01:00
Jörg Thalheim
b1b0e9f6ab
dwarfdump: init at 20161124
2017-02-08 20:45:31 +01:00
Nikolay Amiantov
1900f22760
jre_headless: add alias
2017-02-08 21:35:58 +03:00
Andrew Cann
3082647e74
trezord: init at 1.2.0 ( #22054 )
2017-02-08 17:18:22 +01:00
Peter Hoeg
c2a963ceae
neovim-qt: works with qt 5.6 and msgpack 2.0
2017-02-08 22:37:46 +08:00
Nikolay Amiantov
2fd2fcf54d
linuxPackages.nvidia_x11: refactor, build more from source
...
* Use libglvnd;
* Compile nvidia-settings, nvidia-persistenced from source;
* Generalize builder.
2017-02-08 16:57:46 +03:00
Nikolay Amiantov
750e7ba0d9
libglvnd: init at 2016-12-22
2017-02-08 16:56:50 +03:00
Pascal Wittmann
39f2bf0976
Merge pull request #22468 from taktoa/souper
...
souper: init at 2017-01-05
2017-02-08 09:20:43 +01:00
Benjamin Staffin
9dc2cb2e84
Merge pull request #22476 from benley/redshift-kde
...
redshift-plasma-applet: init at 1.0.17
2017-02-07 20:21:56 -05:00
Vladimír Čunát
ce9d30e734
Merge #22241 : amdgpu-pro: 16.50 -> 16.60
2017-02-07 20:49:58 +01:00
Fernando J Pando
34b5c9a4de
buildbot: 0.9.0.post1 -> 0.9.3
...
- Fixes unneeded patching
- Adds worker to build inputs now needed for tests
- Replaces enableworker option with worker configuration module
- Openssh required for tests
- Fixes worker hardcoded paths
- Tested on Nixos Unstable
2017-02-07 11:14:42 -05:00
Kier Davis
83865b2c6c
intel-ocl: init at r4.0-59481
2017-02-07 15:20:30 +03:00
Pascal Wittmann
d099c1b96d
Merge pull request #22507 from layus/dafny-update
...
Add dafny; fixup Boogie
2017-02-07 10:21:35 +01:00
Pascal Wittmann
04a128540d
Merge pull request #22285 from nand0p/electricsheep
...
electricsheep: 2.6.8 -> 2.7b33
2017-02-07 10:20:20 +01:00
Guillaume Maudoux
aeaf893e57
dafny: init at v1.9.8
2017-02-07 10:13:42 +01:00
Remy Goldschmidt
ac72948c94
souper: init at 2017-01-05
2017-02-06 21:57:45 -06:00
David McFarland
905627c7c5
xorg-server: fglrxCompat -> abiCompat
...
Allows it to be used for fglrx (1.17) and amdgpu-pro (1.18)
2017-02-06 23:16:21 -04:00
Graham Christensen
8608f91661
gnash: remove due to removal of ming
2017-02-06 21:23:40 -05:00
Shea Levy
41ba205dda
ming: remove.
...
The project seems dead and there are recent security issues.
See https://lwn.net/Vulnerabilities/712664/
2017-02-06 21:08:57 -05:00
Fernando J Pando
17d74c4912
electricsheep: 2.6.8 -> 2.7b33
...
- Updates and fixes currently broken package.
- Provides Flam3 and GLee dependencies.
- Tested on Nixos Unstable.
2017-02-06 18:05:38 -05:00
Guillaume Maudoux
ccb2d83980
boogie: fix basename issues; promote to package
2017-02-06 22:50:05 +01:00
Facundo Domínguez
ae2932249e
spark: 1.6.0 -> 2.1.0
...
Tested in linux with:
nix-env -f . -i spark-1.6.0
nix-env -f . -i spark
cc @thoughtpolice @offlinehacker
2017-02-06 17:27:57 -03:00
Pascal Wittmann
442e0ab1f6
Merge pull request #22492 from schneefux/pkg.shaarli-material
...
shaarli: add material theme package
2017-02-06 18:36:29 +01:00
Thomas Tuegel
f0bbf73e0b
Merge pull request #22477 from peterhoeg/f/kdiff3
...
kdiff3-qt5: init at 1.7.0
2017-02-06 11:21:31 -06:00
Celine Mercier
78c052e91a
ecopcr: init at 0.8.0
2017-02-06 16:01:08 +01:00
Joachim F
6eb6130e15
Merge pull request #22495 from pradeepchhetri/wuzz-20170205
...
wuzz: init at 2017-02-05
2017-02-06 15:45:56 +01:00
Pradeep Chhetri
f22a7f0558
wuzz: init at 2017-02-05
2017-02-06 19:28:40 +05:30
Franz Pletz
900326fdc0
wget: add some more dependencies & small cleanups
...
cc #22416
2017-02-06 13:18:33 +01:00
Franz Pletz
8b9e2010b4
libidn2: init at 0.16
...
wget now needs libidn2 instead of libidn.
cc #22416
2017-02-06 13:18:20 +01:00
Benjamin Staffin
962c4430ba
redshift-plasma-applet: init at 1.0.17
2017-02-05 18:15:39 -05:00
Thomas Tuegel
d93fdc0f54
Merge pull request #22314 from peterhoeg/u/krename
...
krename-qt5: init at 20161228
2017-02-05 15:26:08 -06:00
Michael Raskin
6642e5d873
Merge pull request #22146 from dasuxullebt/gbsplay
...
gbsplay: init at version 2016-12-17
2017-02-05 19:01:47 +00:00
James Alexander Feldman-Crough
0f905b0dc8
polybar: init at 3.0.4
...
Polybar is a status bar in the vein of xmobar or i3bar.
2017-02-05 10:57:02 -08:00
Joachim F
09b6d2eaed
Merge pull request #22432 from peterhoeg/d/freerdp
...
freerdp: 20160909 -> 20170201 and rename freerdpStable to freerdp_legacy
2017-02-05 17:08:19 +01:00
Joachim F
4459f26ad8
Merge pull request #22175 from dancek/illum
...
illum: init at 0.4
2017-02-05 16:41:30 +01:00
Michael Raskin
6d9a37bfc8
CLX and StumpWM no longer need a pinned SBCL
2017-02-05 13:03:03 +01:00
Michael Raskin
5d6f798efc
stumpwm: use fresh SBCL
2017-02-05 13:03:03 +01:00
Nikolay Amiantov
90bc1a8595
Merge pull request #22353 from abbradar/bluetooth
...
Bluetooth improvements
2017-02-05 13:18:48 +03:00
Volth
f5bbecc5c5
scala 2.12 requires jre8
2017-02-05 06:24:56 +00:00
Peter Hoeg
e881a21ada
weston: depend on freerdp_legacy
2017-02-05 14:04:51 +08:00
Peter Hoeg
05684f313e
freerdp: 20160909 -> 20170201 and rename old freerdp to freerdp_legacy
...
The former "stable" version of FreeRDP was actually not stable - it just
happened to have a released version while being both buggy and insecure.
The "unstable" branch hasn't seen a release in years, but everybody
should be using this instead and I have been using it as a daily driver
for ages.
This new version works beautifully here.
If/when at some point upstream does a normal release, we can bring back
stable/unstable if needed.
As I am quite dependent on FreeRDP working properly, I will be commit to
keeping this updated.
The commit used for this release follows the Arch Linux release.
2017-02-05 14:03:59 +08:00
Thomas Tuegel
f9c684e152
Merge pull request #22404 from cpages/jsoncpp
...
jsoncpp: update and drop old version
2017-02-04 20:06:53 -06:00
Léo Gaspard
68a609b059
redsocks: init at 0.5
2017-02-05 01:20:03 +01:00
Vladimír Čunát
a2c867fd39
Merge branch 'staging'
2017-02-04 21:02:46 +01:00
Hannu Hartikainen
d91b39b3f9
illum: init at 0.4
2017-02-04 20:22:51 +02:00
volth
9e299acf87
liberastika: init at 1.1.5 ( #22420 )
2017-02-04 16:38:01 +01:00
volth
762cc106b4
virt-top: init at 1.0.8 ( #21536 )
2017-02-04 16:07:45 +01:00
pngwjpgh
913c5b21d5
gcs: init at 4.8.0 ( #22173 )
2017-02-04 15:36:38 +01:00
Vladimír Čunát
94a7a80f0b
Revert "spidermonkey_24: remove"
...
This reverts commit 5dacc53af3
2017-02-04 11:53:23 +01:00
Jörg Thalheim
f5db07b158
Merge pull request #22426 from khumba/squirrel-sql
...
squirrel-sql: init at 3.7.1
2017-02-04 08:40:36 +01:00
Bryan Gardiner
7d3db4f491
squirrel-sql: init at 3.7.1
2017-02-03 23:29:18 -08:00
Michael Raskin
948361522a
Merge pull request #22415 from volth/liberation_ttf_v1
...
liberation-fonts: init at 1.07.4
2017-02-03 22:07:17 +00:00
Volth
6a5ee48724
liberation-fonts: init at 1.07.4
2017-02-03 22:04:35 +00:00
Evan Danaher
b2fb95a6cf
neovim-remote: move from python-packages to /neovim/neovim-remote.
2017-02-03 16:58:22 -05:00
Pascal Wittmann
c1604543bf
llpp: 2016-05-07 -> 2017-01-18
2017-02-03 22:12:53 +01:00
Jörg Thalheim
a8e32d68b5
Merge pull request #22412 from makefu/exfat-nofuse
...
exfat-nofuse: init at 2017-01-03
2017-02-03 20:07:26 +01:00
makefu
26a27e4657
exfat-nofuse: init at 2017-01-03
2017-02-03 19:49:27 +01:00
rnhmjoj
0788889220
dnschain: fix build
2017-02-03 19:49:14 +01:00
Ollie Charles
7d00b5faed
muchsync: init at 2
2017-02-03 17:57:53 +00:00
Nikolay Amiantov
230c97c944
Merge pull request #22303 from abbradar/nfs4
...
NFS improvements
2017-02-03 20:04:25 +03:00
Thomas Tuegel
74f5672a1c
Merge pull request #22406 from abbradar/qtenv
...
Qt 5: Use buildEnv for env, don't use it for packages
2017-02-03 09:57:58 -06:00
Nikolay Amiantov
8a67af13f4
multimc: don't use qt.full
2017-02-03 18:21:16 +03:00
Nikolay Amiantov
de9017ee68
vokoscreen: don't use qt.full
2017-02-03 18:21:16 +03:00
Nikolay Amiantov
f0564ae299
cb2bib: don't use qt.full
2017-02-03 18:21:15 +03:00
Nikolay Amiantov
2c7e3f276d
keepassx-community: don't use qt.full
2017-02-03 18:21:15 +03:00
Nikolay Amiantov
c7d7ad1d9f
qjackctl: don't use qt.full
2017-02-03 18:21:14 +03:00
Vladimír Čunát
2ba076e99c
Merge branch 'master' into staging
...
>11k more build jobs on master, just for Linux :-/
This way staging will never catch up.
2017-02-03 15:32:08 +01:00
Carles Pagès
ba596c9ce9
jsoncpp: remove unused 1.6 version
2017-02-03 13:21:57 +01:00
Michael Raskin
d042a831a3
libzmf: init at 0.0.1
2017-02-03 13:14:39 +01:00
Michael Raskin
58711ecf0c
libreoffice-still: 5.1.6.2 -> 5.2.5.1 (branch switch upstream)
2017-02-03 13:14:39 +01:00
Vladimír Čunát
adab4cd58b
Merge branch 'master' into staging
2017-02-03 11:47:38 +01:00
Benjamin Staffin
53e6431d61
Merge pull request #22358 from yorickvP/asteriskupd
...
asterisk: add lts version
2017-02-03 02:30:34 -05:00
Edward Tjörnhammar
62dc683096
kodiPlugins: updates
...
* Added exodus in favour of genesis, same developer and old plugin is dead
* Added gamepad(controllers) inputs as enableControllers
* Updated SVTPlay, HyperLauncher
* Removed SALTS, doesn't work without a FHS
2017-02-02 21:12:55 +01:00
Yorick van Pelt
529853b5e1
asterisk: add lts version, fix impurity
2017-02-02 15:15:37 +01:00
goibhniu
8605cdc898
Merge pull request #22207 from league/vokoscreen
...
vokoscreen: init at 2.5.0
2017-02-02 09:51:44 +01:00
Gabriel Ebner
311ec6abd5
Merge pull request #22361 from peterhoeg/u/crunch
...
speedcrunch: 0.11 -> 0.12.0
2017-02-02 07:54:06 +01:00
Peter Hoeg
f7871d3433
suil: 0.8.2 -> 0.8.4
...
We can now also build against qt5 but not qt4 and qt5 at the same time.
2017-02-02 13:41:23 +08:00
Peter Hoeg
8d803b90ac
kdiff3-qt5: init at 1.7.0
...
Upstream hasn't made a formal release yet of the qt5 version which is why I'm
not replacing the existing kde4 version.
2017-02-02 13:01:40 +08:00
Drakonis
15bc80f3b9
keepassx-community: init at 2.1.0
...
- deprecating keepassx-reboot (was at 2.0.3)
2017-02-01 21:21:34 -05:00
Peter Hoeg
58a5d0783e
speedcrunch: 0.11 -> 0.12.0
...
Also:
- build against qt5 instead of qt4
2017-02-02 09:13:54 +08:00
Jascha Geerds
888be22aee
Merge pull request #22201 from lsix/update_docker_compose
...
Update docker compose
2017-02-02 00:39:04 +01:00
Nikolay Amiantov
496476be4e
bluez4: reintroduce to nixpkgs
...
It's still needed by KDE4. It was there, just unreferenced from all-packages.
2017-02-02 00:52:54 +03:00
Robert Helgesson
de172ae061
copyright-update: init at 2016.1018
2017-02-01 22:19:24 +01:00
Bjørn Forsman
3e5022c787
hardinfo: init at 0.5.1
...
Display information about your hardware and operating system.
2017-02-01 21:12:59 +01:00
Vladimír Čunát
a2e7770b51
Merge branch 'master' into staging
...
There have been some larger security rebuilds on master.
2017-02-01 15:56:35 +01:00
Nikolay Amiantov
1426779072
portmap: remove
...
rpcbind is used instead
2017-02-01 02:44:56 +03:00
Peter Hoeg
887590e1d2
wireshark: use cmake and move to gtk3/qt5
...
wireshark used to use autotools, but instead we now use cmake. The
change alone brought to light a few missing required dependencies.
Additionally, wireshark was using gtk2 and qt4, so that has changed to
gtk3 and qt5.
2017-01-31 21:20:12 +01:00
Peter Hoeg
338dcba251
krename-qt5: init at 20161228
...
Upstream hasn't made a proper release based on qt5/kf5, so I'm adding this
package in addition to the kde4 based package instead of replacing it.
2017-01-31 20:36:11 +08:00
Matthias Beyer
904bcb391d
yaft: init at 0.2.9
2017-01-31 13:20:26 +01:00
Matthias Beyer
3ccc139b3d
cataract: init at 1.1.0 and HEAD
2017-01-31 09:20:08 +00:00
Orivej Desh
d409d23945
pidgin-xmpp-receipts: init at 0.7
2017-01-31 09:33:30 +01:00
Tim Digel
e2bf0416a9
pgroonga: init at 1.1.9
2017-01-31 09:27:36 +01:00
Franz Pletz
1128726064
Merge pull request #22305 from jbaum98/smartmontools
...
smartmontools: 6.4 -> 6.5 and fix segfault on darwin
2017-01-31 06:04:17 +01:00
Jake Waksbaum
a9afa48915
smartmontools: 6.4 -> 6.5 and fix segfault on darwin
2017-01-30 22:09:21 -05:00
Alexey Shmalko
682e7a3643
Merge pull request #22281 from vifino/master
...
wmutils-opt: init at v1.0
2017-01-30 22:44:30 +02:00
Adrian Pistol
f6e2772cd3
wmutils-opt: init at v1.0
2017-01-30 20:42:16 +00:00
Vladimír Čunát
612333a770
knot-resolver: yet another attempt to fix build on Darwin
2017-01-30 20:08:16 +01:00
Vladimír Čunát
9cd2dbc569
Merge branch 'master' into staging
...
Hopefully this will fix the mass abortion on Hydra;
restarting the jobs didn't help.
2017-01-30 18:39:36 +01:00
Rahul Gopinath
19180957f5
ruby_1_9: remove package
...
Remove ruby 1.9 since it is EOLed upstream
2017-01-30 11:18:44 +00:00
Eelco Dolstra
5fdc6db957
Revert "add nix-prefetch-source ( #21734 )"
...
This reverts commit ca38ef79e9
2017-01-30 11:44:15 +01:00
Alexey Shmalko
2dc87881b0
Merge pull request #22283 from asymmetric/siji
...
siji: init at 2016-05-14
2017-01-30 12:35:15 +02:00
Lorenzo Manacorda
0ecde73b91
siji: init at 2016-05-14
2017-01-30 11:32:52 +01:00
Vaibhav Sagar
63f609b1a4
ihaskell: remove service configuration. ( #22268 )
...
See #22047 . This change should be reverted after IHaskell has been
updated to support GHC 8.
2017-01-30 08:38:42 +01:00
Niklas Thörne
2eb8163fae
bashdb: init at 4.4-0.92 ( #22275 )
2017-01-29 23:05:04 +01:00
Tom Doggett
fe6c4eb8e6
gcalcli: init at 3.4.0
2017-01-29 17:00:05 +01:00
Tuomas Tynkkynen
424cfe7686
Merge remote-tracking branch 'upstream/master' into staging
2017-01-29 02:16:29 +02:00
Tuomas Tynkkynen
2f38d1fd1f
kmscube: init at 2016-09-19
2017-01-29 02:08:04 +02:00
Arseniy Seroka
d948e55c27
Merge pull request #22240 from pradeepchhetri/openconnect
...
openconnect: 7.06 -> 7.08
2017-01-29 02:13:14 +03:00
Pradeep Chhetri
56ed9f8b94
openconnect: 7.06 -> 7.08
2017-01-29 02:46:19 +05:30
Lluís Batlle i Rossell
57625514f4
Adding nuttcp.
2017-01-28 20:40:21 +01:00
Kevin Cox
c09690b354
Revert "libmsgpack_1_4: remove"
...
This reverts commit ff89e81898
2017-01-28 11:14:31 +00:00
Marius Bergmann
1d6c853860
termite: unbreak by packaging vte-ng
...
termite broke when upgrading Gnome, as this removed a dependency from
the tree. I packaged this dependency (vte-ng) based upon the work of
@globin in https://github.com/NixOS/nixpkgs/issues/22026 .
2017-01-28 01:06:24 +01:00
Christopher League
c1c7d2894d
vokoscreen: init at 2.5.0
...
vokoscreen is an easy to use screencast creator to record educational
videos, live recordings of browser, installation, videoconferences, etc.
It uses Qt5 and ffmpeg.
2017-01-27 16:08:34 -05:00
Robin Gloster
ff89e81898
libmsgpack_1_4: remove
2017-01-27 22:03:23 +01:00
Robin Gloster
52be026bba
libmsgpack_0_5: remove
2017-01-27 21:59:16 +01:00
Robin Gloster
426b61a1c7
openssl_1_0_1: remove
2017-01-27 21:29:53 +01:00
Robin Gloster
c466e31a0f
libressl_2_3: remove
2017-01-27 20:39:32 +01:00
Robin Gloster
c67805ff17
llvmPackages_36: remove
2017-01-27 20:12:54 +01:00
Robin Gloster
aa686fe5c3
gnutls33: remove
2017-01-27 18:37:24 +01:00
Robin Gloster
e11f8dc72d
miraclecast: remove obsolete enableKDbus flag
2017-01-27 18:24:06 +01:00
Franz Pletz
ae3fc70ede
Merge pull request #22124 from mayflower/feature/frab
...
frab: init at 2016-12-28 & module
2017-01-27 17:15:05 +01:00
Svein Ove Aas
3d78976c58
nginx-config-formatter: init at 2016-06-16 ( #22179 )
2017-01-27 16:52:20 +01:00
Robin Gloster
8769ddc823
apacheHttpd_2_2: remove
2017-01-27 15:33:54 +01:00
Joachim F
da1cd49747
Merge pull request #22193 from Gabriel439/gabriel/dhallToNix
...
Add a `pkgs.dhallToNix` utility
2017-01-27 13:21:30 +01:00
Lancelot SIX
bf23aaf893
docker_compose: 1.9.0 -> 1.10.0
2017-01-27 12:38:12 +01:00
Langston Barrett
d486fb053b
coqPackages.math-classes: init at 2016-06-08
2017-01-27 11:16:30 +00:00
Frederik Rietdijk
46b1ea260a
pythonPackages.ansible2: move 2.2 to separate file, make default
...
`pythonPackages.ansible_2_2` is now the default `ansible`.
2017-01-27 10:15:31 +01:00
Gabriel Gonzalez
c791c0fd16
Add a pkgs.dhallToNix utility
...
This adds a `dhallToNix` utility which compiles expression from the Dhall
configuration language to Nix using Nix's support for "import from derivation".
The main motivation of this compiler is to allow users to carve out small typed
subsets of Nix projects. Everything in the Dhall language (except `Double`s)
can be translated to Nix in this way, including functions.
2017-01-26 20:11:49 -08:00
Graham Christensen
f46c5b293b
qemu: 2.7 -> 2.8, drop 2.7
2017-01-26 20:23:40 -05:00
Tuomas Tynkkynen
be0e48e48f
Merge remote-tracking branch 'upstream/master' into staging
2017-01-27 02:18:44 +02:00
