nixpkgs/pkgs/tools/networking/network-manager-applet
Lluís Batlle i Rossell 3b26ba7019 Merge remote-tracking branch 'central/master' into stdenv-updates
Conflicts:
	pkgs/os-specific/linux/alsa-utils/default.nix
2013-01-27 11:32:12 +01:00
..
default.nix Merge remote-tracking branch 'central/master' into stdenv-updates 2013-01-27 11:32:12 +01:00