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-08-03 22:29:41 +04:00
2014-10-06 02:43:57 +04:00
2014-06-10 11:46:05 +02:00
2014-09-19 09:23:28 +02:00
2014-09-25 16:49:50 +02:00
2014-09-13 21:48:29 +02:00
2014-09-20 23:32:17 +01:00
2014-05-10 13:50:49 +03:00
2014-08-24 22:31:37 +02:00
2014-09-28 20:10:11 -04:00
2014-09-13 21:48:29 +02:00
2014-06-02 19:42:15 +02:00
2014-06-10 18:12:33 -05:00
2014-09-02 14:25:17 +04:00
2014-09-22 01:57:01 +02:00
2014-05-29 22:16:07 +02:00