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
..
admin
archivers
audio
backup
bluetooth
cd-dvd
compression
filesystems	Merge remote-tracking branch 'origin/master' into staging	2014-07-01 11:25:41 +02:00
graphics
inputmethods/fcitx
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
package-management
security	Merge remote-tracking branch 'origin/master' into staging	2014-07-01 11:25:41 +02:00
system	Merge remote-tracking branch 'origin/master' into staging	2014-07-01 11:25:41 +02:00
text
typesetting	Merge remote-tracking branch 'origin/master' into staging	2014-07-01 11:25:41 +02:00
video
virtualization
X11