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
..
2014-05-12 15:03:42 +02:00
2014-03-19 22:04:35 -04:00
2014-07-16 11:29:40 -04:00