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
..
darwin	Another attempt to eradicate ensureDir	2014-06-30 14:56:10 +02:00
gnu
linux	Merge remote-tracking branch 'origin/master' into staging	2014-07-01 11:25:41 +02:00
windows	Merge 'mingw-w64' and 'darwin' into cross-win-osx.	2014-03-12 10:16:51 +01:00