Vladimír Čunát ac6761c908 Merge master into stdenv-updates
Conflicts:
	pkgs/applications/version-management/gource/default.nix
	pkgs/top-level/all-packages.nix
2014-01-20 19:39:28 +01:00
..
2014-01-07 14:25:42 +01:00
2014-01-07 14:24:59 +01:00
2014-01-20 19:39:28 +01:00
2014-01-03 11:56:41 +01:00
2013-12-14 00:41:47 +02:00