Tuomas Tynkkynen aadaa91379 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/applications/networking/browsers/vivaldi/default.nix
	pkgs/misc/emulators/wine/base.nix
2016-05-03 23:12:48 +03:00
..
2016-04-22 03:58:08 +02:00
2016-04-14 23:03:36 -07:00
2016-04-26 20:34:41 +02:00
2016-05-02 13:04:41 -05:00