Vladimír Čunát
e51f73652d
Merge recent master into staging
Hydra: ?compare=1149952
Conflicts:
nixos/doc/manual/configuration.xml (changed split file)
nixos/modules/config/users-groups.nix (choosing filterNull instead of inline definition)
pkgs/development/libraries/readline/readline6.3.nix (auto-solved)
2014-08-30 10:04:02 +02:00
..
2012-09-14 23:24:10 +02:00
2013-09-28 22:57:14 +08:00
2014-06-30 14:56:10 +02:00
2014-07-28 11:31:14 +02:00
2014-05-13 20:07:13 +02:00
2014-06-30 14:56:10 +02:00
2014-07-08 00:34:56 +02:00
2014-08-30 10:04:02 +02:00
2012-01-18 20:16:00 +00:00
2014-08-21 12:45:28 +02:00
2014-08-25 13:56:53 +02:00
2014-07-28 11:31:14 +02:00
2013-12-12 03:11:34 +02:00
2014-07-28 11:31:14 +02:00
2013-12-15 13:00:22 +02:00
2014-08-25 11:03:35 +02:00
2014-01-03 14:31:57 +01:00
2012-07-31 16:30:50 -04:00
2014-03-11 18:36:16 +01:00
2013-07-05 14:45:58 +02:00
2014-07-17 12:25:22 +02:00
2014-08-24 22:31:37 +02:00
2013-06-25 14:12:16 +02:00
2013-06-25 14:12:16 +02:00
2014-08-01 18:19:03 +02:00
2012-11-29 13:43:37 +01:00
2014-02-07 13:20:52 +01:00
2012-01-18 20:16:00 +00:00
2013-08-21 01:23:40 +02:00
2014-01-23 10:35:02 +01:00
2014-07-28 11:31:14 +02:00
2014-07-28 11:31:14 +02:00
2014-08-24 22:31:37 +02:00
2014-04-24 10:59:29 +02:00
2014-04-29 16:49:21 +02:00
2013-08-14 09:23:15 +08:00
2012-12-12 12:36:18 +01:00
2014-07-22 11:00:00 +02:00
2014-08-24 20:28:12 +02:00
2014-07-30 12:43:24 +02:00
2014-07-28 11:31:14 +02:00