Vladimír Čunát 842420c3e1 Merge branch 'master' into stdenv-updates
Conflicts (relatively simple):
	pkgs/development/interpreters/python/2.7/default.nix
	pkgs/development/libraries/dbus/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/glibc/2.17/common.nix
2013-06-20 19:21:25 +02:00
2013-06-13 15:56:23 +02:00
2013-06-13 15:56:23 +02:00
2012-06-04 03:53:25 +00:00
Description
No description provided
1.5 GiB
Languages
Nix 96.3%
Shell 1.8%
Python 0.7%
Perl 0.4%
C 0.3%
Other 0.1%