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
..
activemq	Merge remote-tracking branch 'origin/master' into staging	2014-07-07 13:16:26 +02:00
rabbitmq.nix	RabbitMQ service: add properties essential for clusters	2014-07-26 14:33:53 +03:00