Eelco Dolstra 7f410ef923 Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/misc/vim-plugins/default.nix		2014-07-22 11:00:00 +02:00
..
default.nix	Merge remote-tracking branch 'origin/master' into staging	2014-07-22 11:00:00 +02:00