Peter Simons 2d326e5032 Merge remote-tracking branch 'origin/master' into staging. ... Conflicts: pkgs/desktops/e18/enlightenment.nix		2014-08-04 16:51:47 +02:00
..
influxdb	Another attempt to eradicate ensureDir	2014-06-30 14:56:10 +02:00
mongodb	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
redis	lib/maintainers: add "berdario", maintain redis	2014-05-15 21:11:17 +02:00
rethinkdb	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
riak	erlangR16: updated to R16B03-1	2014-06-05 01:16:50 +01:00