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
..
cacert	cacert: Update to 20140704	2014-07-30 10:14:40 +02:00
freepats
iana-etc
miscfiles	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
mobile-broadband-provider-info
poppler-data
shared-desktop-ontologies
shared-mime-info
tzdata