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-04-18 00:07:39 +03:00
2015-05-11 10:05:23 +02:00
2015-05-08 14:10:16 +02:00
2015-05-08 14:10:16 +02:00
2015-05-08 14:10:16 +02:00
2015-05-05 21:44:48 +02:00
2015-05-10 13:46:01 +02:00
2015-05-10 13:46:01 +02:00
2015-05-11 00:52:52 -04:00
2015-04-19 19:48:11 +02:00
2015-05-10 13:46:00 +02:00
2015-05-04 12:27:03 +02:00
2015-04-13 11:08:15 +01:00
2015-04-18 00:07:57 +03:00
2015-02-10 22:08:01 +01:00
2015-05-10 13:45:59 +02:00
2015-05-10 13:45:59 +02:00
2015-04-18 00:07:25 +03:00
2015-05-11 10:05:23 +02:00
2015-03-29 03:34:04 +02:00
2015-04-16 13:32:48 +03:00
2015-04-01 22:54:45 +02:00
2015-04-16 13:32:48 +03:00
2015-04-18 00:07:39 +03:00
2015-05-10 13:45:59 +02:00
2015-02-21 18:53:35 +01:00
2015-03-08 18:38:04 +03:00