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
..
2016-09-01 16:16:31 +02:00
2016-07-08 14:54:44 +02:00
2016-04-26 13:38:03 +01:00
2016-04-06 15:31:04 +01:00
2016-09-01 16:16:31 +02:00
2016-08-03 09:20:37 +02:00
2016-04-25 12:37:18 +02:00
2016-08-28 11:42:21 +02:00
2016-04-25 12:01:05 -05:00
2016-08-23 00:04:39 +03:00
2016-08-02 21:42:43 +03:00
2016-06-24 20:41:40 +02:00
2016-08-02 21:42:43 +03:00
2016-09-01 16:16:31 +02:00
2016-04-26 13:38:03 +01:00
2016-08-23 04:32:21 +03:00
2016-08-02 21:17:44 +03:00
2016-05-23 04:52:11 +03:00
2016-09-03 01:02:51 +03:00
2016-09-01 16:16:31 +02:00
2016-09-01 17:42:39 +02:00
2016-09-01 17:11:32 +02:00
2016-09-01 16:16:31 +02:00
2016-09-01 16:16:31 +02:00
2016-09-01 16:16:31 +02:00
2016-08-02 21:42:43 +03:00
2016-05-19 10:00:28 +02:00
2016-06-20 01:06:07 +02:00
2016-08-02 17:54:42 +02:00
2016-04-26 13:38:03 +01:00
2016-04-25 18:20:01 +02:00
2016-04-27 12:25:22 +02:00
2016-07-29 17:22:20 +02:00