Vladimír Čunát 26af997d41 Merge branch 'master' into stdenv-updates
Conflicts (simple):
	pkgs/applications/networking/browsers/chromium/default.nix
	pkgs/development/libraries/libsoup/default.nix
	pkgs/os-specific/linux/kernel/manual-config.nix
	pkgs/os-specific/linux/qemu-kvm/default.nix
2013-03-02 10:41:53 +01:00
..
2012-02-25 19:57:34 +00:00
2013-02-07 20:44:02 -05:00
2012-04-20 04:31:17 +00:00
2012-08-08 03:16:57 +04:00