Domen Kožar
bb4d658f64
Merge branch 'master' into staging
Conflicts:
nixos/doc/manual/release-notes/rl-unstable.xml
nixos/modules/services/printing/cupsd.nix
pkgs/applications/misc/calibre/default.nix
pkgs/development/haskell-modules/hackage-packages.nix
pkgs/development/libraries/libsodium/default.nix
pkgs/misc/emulators/wine/unstable.nix
pkgs/top-level/all-packages.nix
2015-05-11 10:05:23 +02:00
..
2015-01-26 02:09:04 +01:00
2015-04-20 17:11:19 +00:00
2015-05-04 18:58:35 +00:00
2015-04-25 14:18:25 +02:00
2015-03-07 00:26:57 +03:00
2015-05-07 01:51:05 +02:00
2015-04-25 12:02:33 +02:00
2015-04-07 14:10:13 +00:00
2015-04-29 23:02:09 +02:00
2015-04-25 14:21:27 +02:00
2015-05-06 21:53:39 +02:00
2015-05-10 19:36:20 -04:00
2015-04-06 14:13:07 +02:00
2015-04-16 20:18:03 +03:00
2015-05-07 01:44:49 -07:00
2015-05-10 20:47:50 +02:00
2015-02-19 14:13:00 +01:00
2015-01-07 14:55:41 -08:00
2015-04-23 14:30:12 -04:00
2015-04-19 22:06:45 +02:00
2015-02-26 22:21:27 +00:00
2015-04-14 10:45:28 +03:00
2015-04-28 19:00:27 +03:00
2015-05-03 17:09:50 -05:00