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-06-30 14:56:10 +02:00
2014-08-27 16:53:37 +02:00
2014-07-22 00:35:59 -04:00
2014-06-10 16:34:07 +02:00
2014-08-17 23:06:51 -04:00
2014-06-30 14:56:10 +02:00
2014-06-11 12:05:06 +02:00
2014-03-13 17:01:58 -04:00
2014-06-10 13:19:57 +02:00
2014-08-24 22:31:37 +02:00
2014-08-25 17:13:50 +02:00
2014-07-28 11:31:14 +02:00
2014-08-15 12:08:42 +02:00
2014-08-24 22:31:37 +02:00
2014-08-24 22:31:37 +02:00
2014-08-03 14:04:45 +02:00
2014-08-01 16:56:27 +02:00
2014-08-30 10:04:02 +02:00
2014-05-13 16:38:12 -05:00
2013-04-10 18:26:42 +02:00
2014-08-24 22:31:37 +02:00
2014-07-28 11:31:14 +02:00
2014-08-24 22:31:37 +02:00
2014-05-24 03:36:10 +02:00
2013-06-29 15:14:02 +02:00
2014-07-28 11:31:14 +02:00
2014-07-18 16:21:48 -04:00
2014-07-28 11:31:14 +02:00
2014-08-24 22:31:37 +02:00
2013-06-21 12:16:15 +02:00
2014-07-28 11:31:14 +02:00
2014-07-28 11:31:14 +02:00
2014-05-27 15:27:17 -05:00