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-20 19:21:25 +02:00
2013-05-09 13:57:59 +02:00
2013-05-09 13:57:59 +02:00
2013-03-21 13:25:51 +01:00
2013-06-03 22:16:05 +02:00
2013-01-22 23:43:34 +01:00
2013-03-06 14:10:54 +01:00
2013-03-12 11:46:09 +01:00
2012-12-29 00:49:21 +01:00