nixpkgs/pkgs/applications/networking/newsreaders
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
..
kwooty
liferea gobject-introspection: refer to shlibs with absolute paths in typelibs 2014-08-14 23:16:51 +02:00
pan
slrn Fix many package descriptions 2014-08-24 22:31:37 +02:00