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-15 02:16:04 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-07-29 15:34:22 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-08-28 13:35:36 -07:00
2014-08-10 14:51:23 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-04-14 21:03:43 +02:00
2014-07-30 13:18:33 +02:00
2013-10-10 13:28:20 +02:00
2014-06-28 16:05:47 +02:00
2014-07-02 11:28:43 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-04-14 14:02:44 +02:00
2014-07-01 16:28:34 +02:00
2014-06-28 16:05:47 +02:00
2013-10-10 13:28:20 +02:00
2013-10-10 13:28:20 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00
2014-06-28 16:05:47 +02:00