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-03-28 18:52:37 -05:00
2014-02-24 07:26:23 +01:00
2014-08-24 22:31:37 +02:00
2013-10-17 18:35:24 +02:00
2014-08-14 16:10:30 +02:00
2014-07-28 11:31:14 +02:00
2014-01-13 17:05:45 +01:00
2014-01-13 17:05:45 +01:00
2014-08-24 22:31:37 +02:00
2014-07-28 11:31:14 +02:00
2014-08-14 02:06:44 +02:00
2013-05-17 23:48:22 +02:00