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
..
applications	nano: 2.6.3 -> 2.7.0 (#18201)	2016-09-02 23:26:02 +02:00
build-support	Merge commit 'adaee73' from staging into master	2016-09-03 01:02:51 +03:00
data	roboto-slab: init at 2016-01-11	2016-09-02 21:50:42 +02:00
desktops	Merge commit 'adaee73' from staging into master	2016-09-03 01:02:51 +03:00
development	Merge commit 'adaee73' from staging into master	2016-09-03 01:02:51 +03:00
games	extremetuxracer: Fix build	2016-09-03 00:36:31 +03:00
misc	urbit: Fix build	2016-09-02 19:04:41 +03:00
os-specific	systemd: apply patch to fix #18158	2016-09-02 23:39:19 +02:00
servers	Merge commit 'adaee73' from staging into master	2016-09-03 01:02:51 +03:00
shells	Merge branch 'master' into staging	2016-08-27 23:54:54 +01:00
stdenv	stdenv: leave SSL_CERT_FILE in shells (#15571)	2016-09-01 20:50:08 +02:00
test	Remove cruft	2016-04-26 17:31:54 +02:00
tools	Merge commit 'adaee73' from staging into master	2016-09-03 01:02:51 +03:00
top-level	roboto-slab: init at 2016-01-11	2016-09-02 21:50:42 +02:00