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 branch 'master' into stdenv-updates.	2013-01-11 15:46:10 +01:00
unstable.nix	Merge remote-tracking branch 'central/master' into stdenv-updates	2013-01-27 11:32:12 +01:00