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
..
2014-08-24 22:31:37 +02:00
2014-06-30 14:56:10 +02:00
2013-08-27 04:39:33 +02:00
2014-08-24 22:31:37 +02:00
2013-10-08 11:07:14 +02:00
2014-05-18 20:51:08 -07:00
2014-03-13 13:01:49 -07:00
2014-08-24 22:31:37 +02:00
2014-07-22 11:01:32 +02:00
2014-07-10 15:11:12 +01:00
2014-02-17 17:11:58 +01:00
2014-07-22 11:01:32 +02:00
2014-07-28 11:31:14 +02:00
2014-08-24 20:28:12 +02:00
2014-08-24 22:31:37 +02:00
2014-08-18 16:22:51 +02:00
2014-05-31 15:49:13 +02:00
2014-05-31 15:49:13 +02:00
2014-06-30 14:56:10 +02:00
2014-08-30 10:04:02 +02:00
2014-04-24 08:05:44 +02:00
2014-08-04 16:51:47 +02:00
2014-08-24 22:31:37 +02:00
2014-07-22 11:01:32 +02:00
2014-08-24 22:31:37 +02:00
2014-02-12 00:51:11 +00:00
2014-08-24 22:31:37 +02:00
2014-07-28 11:31:14 +02:00
2014-07-14 15:35:27 +02:00
2014-06-30 12:48:38 +02:00
2014-05-31 15:49:13 +02:00
2014-05-28 01:33:28 +04:00
2014-08-24 22:31:37 +02:00
2014-07-15 01:53:07 +01:00
2014-08-10 23:18:57 -05:00
2014-06-30 14:56:10 +02:00