Eelco Dolstra a85dcf4a00 Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/development/libraries/libav/default.nix
	pkgs/shells/bash/bash-4.2-patches.nix
	pkgs/stdenv/generic/default.nix
2014-10-07 00:09:37 +02:00
..
2014-09-13 02:16:53 +02:00
2014-09-21 07:04:01 +01:00
2014-08-23 12:30:45 +04:00
2014-09-29 09:45:59 -04:00