Tuomas Tynkkynen 747ebe3f66 Merge remote-tracking branch 'upstream/master' into staging ... Conflicts: pkgs/top-level/all-packages.nix		2018-04-03 02:22:54 +03:00
..
bind	bind: 9.12.0 -> 9.12.1	2018-03-17 12:32:55 -07:00
coredns
knot-dns	treewide: remove libintl hacks	2018-03-22 16:50:11 -05:00
knot-resolver	knot-resolver: fix /bin/sh impurity	2018-04-01 10:53:18 +02:00
nsd	nsd: 4.1.19 -> 4.1.20	2018-02-28 07:05:12 +00:00
pdns-recursor
powerdns