Tuomas Tynkkynen 34f95d92a2 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/applications/misc/pytrainer/default.nix
	pkgs/development/tools/pew/default.nix
	pkgs/tools/misc/you-get/default.nix
2018-02-28 20:52:49 +02:00
..
2018-02-13 09:44:52 -06:00
2018-02-13 09:45:03 -06:00
2015-05-12 15:05:01 +02:00
2015-05-12 15:05:01 +02:00