Orivej Desh 1161741351 Merge branch 'master' into staging ... * master: (28 commits) go_1_9: skip flaky TestWaitGroupMisuse2 erlangR18: fix patch hashes with fetchpatch xml2: replace dead links nixos/pam: fix docs about path to u2f_keys file cinelerra: add a note about parallel building msmtp: install docs and examples (#31769) kernel: Fix out-of-tree modules on aarch64 nixos/tests/acme: update terms of service to fix test gixy: init at 0.1.8 pythonPackages.ConfigArgParse: 0.9.3 -> 0.12.0, refactor, move to python-modules mono: init at 4.8 wal-g: fix license so not to break evaluation wal-g: init at 0.1.2 maintainers: add backuitist nixos/prometheus: Correct documentation for external_labels spidermonkey: replace broken links vagrant: removed custom rake gem vagrant: 2.0.0 -> 2.0.1 nixos/prometheus: add external_labels option nixos/prometheus: add scrape_configs.honor_labels ...		2017-11-17 18:06:22 +00:00
..
applications	Merge branch 'master' into staging	2017-11-17 18:06:22 +00:00
build-support	makeWrapper: delete --set-eval	2017-11-17 12:53:54 +00:00
common-updater
data	Merge pull request #31761 from Ralith/stdman	2017-11-17 01:34:44 +00:00
desktops	Merge pull request #31024 from yegortimoshenko/xfce4-panel/gettext	2017-11-16 20:49:34 +00:00
development	Merge branch 'master' into staging	2017-11-17 18:06:22 +00:00
games	factorio: 0.15.34 -> 0.15.37	2017-11-16 15:48:00 +01:00
misc	makeWrapper: delete --set-eval	2017-11-17 12:53:54 +00:00
os-specific	Merge branch 'master' into staging	2017-11-17 18:06:22 +00:00
servers	Merge branch 'master' into staging	2017-11-17 18:06:22 +00:00
shells	fish-foreign-env: suppress additional harmless warnings	2017-11-14 16:15:58 +07:00
stdenv	Merge branch 'master' into staging	2017-11-17 05:35:09 +00:00
test	treewide: Use *Platform.extensions	2017-09-13 11:16:10 -04:00
tools	Merge branch 'master' into staging	2017-11-17 18:06:22 +00:00
top-level	Merge branch 'master' into staging	2017-11-17 18:06:22 +00:00