Eelco Dolstra 06fc1ec34d Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/servers/serfdom/default.nix		2014-07-01 11:25:41 +02:00
..
audio	Merge remote-tracking branch 'origin/master' into staging	2014-07-01 11:25:41 +02:00
display-managers
editors	Merge remote-tracking branch 'origin/master' into staging	2014-07-01 11:25:41 +02:00
graphics	Merge remote-tracking branch 'origin/master' into staging	2014-07-01 11:25:41 +02:00
ike
misc	Merge remote-tracking branch 'origin/master' into staging	2014-07-01 11:25:41 +02:00
networking	Merge remote-tracking branch 'origin/master' into staging	2014-07-01 11:25:41 +02:00
office	Merge remote-tracking branch 'origin/master' into staging	2014-07-01 11:25:41 +02:00
science	Merge remote-tracking branch 'origin/master' into staging	2014-07-01 11:25:41 +02:00
search
taxes
version-management	Merge remote-tracking branch 'origin/master' into staging	2014-07-01 11:25:41 +02:00
video	Another attempt to eradicate ensureDir	2014-06-30 14:56:10 +02:00
virtualization
window-managers	fetchbzr, fetchdarcs, fetchhg: use rev attr	2014-06-28 21:06:10 +02:00