Tuomas Tynkkynen e2c6740c37 Merge commit 'adaee73' from staging into master ... This one was already merged into release-16.09, so let's not have the stable branch is ahead of master and confuse things. In addition to that, currently we have an odd situation that master has less things actually finished building than in staging. Conflicts: pkgs/data/documentation/man-pages/default.nix		2016-09-03 01:02:51 +03:00
..
config	Merge commit 'adaee73' from staging into master	2016-09-03 01:02:51 +03:00
hardware	Merge branch 'master' into staging	2016-08-21 12:03:41 +01:00
i18n/input-method	Merge pull request #15025 from ericsagnes/modules/manual	2016-08-28 13:57:34 +02:00
installer	Fixes #18124: atomically replace /var/setuid-wrappers/ (#18186)	2016-09-01 20:57:51 +02:00
misc	Merge pull request #15025 from ericsagnes/modules/manual	2016-08-28 13:57:34 +02:00
profiles	documentation: fix start display-manager command	2016-07-04 10:25:31 +02:00
programs	nixos/shadow: setuid wrappers for new{uid,gid}map	2016-08-19 14:59:33 +02:00
security	Fixes #18124: atomically replace /var/setuid-wrappers/ (#18186)	2016-09-01 20:57:51 +02:00
services	Merge #17838: postgresql: Fix use with extensions	2016-09-02 20:09:40 +02:00
system	Fixes #18124: atomically replace /var/setuid-wrappers/ (#18186)	2016-09-01 20:57:51 +02:00
tasks	nixos/filesystems: Drop compat code for filesystems.*.options type	2016-09-01 12:18:33 +03:00
testing	KDE test: Bump kdm start timeout	2016-05-27 11:22:27 +02:00
virtualisation	bightbox-image.nix: use lib in stead of stdenv.lib. Fixes #18208	2016-09-02 10:04:09 +00:00
module-list.nix	ferm: init at 2.3	2016-08-25 21:37:19 +02:00
rename.nix	nixos/modules/rename.nix: fix eval error	2016-08-28 14:47:24 +01:00