Eelco Dolstra f64d84698e Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/applications/audio/espeak/edit.nix
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
2014-07-28 11:30:49 +02:00
..
2014-05-17 11:01:57 +02:00
2014-07-20 23:49:45 +08:00
2013-08-11 14:35:23 +00:00
2013-03-20 11:43:43 +01:00
2014-06-28 14:15:31 +01:00