diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-06-16 10:13:51 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-06-16 10:13:51 +0200 |
| commit | c72ed048923e78796d3a4ccef613a61d7f127059 (patch) | |
| tree | c5b64a872bdfc8f700e144ce0033922ed73ad268 /pkgs/development/python-modules/rangehttpserver | |
| parent | 81b7f5fe637b5fb3f507e093ad5a52aff54b953c (diff) | |
| parent | ccda14879efd818b17a0b85bb0c3a512c1ebf84d (diff) | |
| parent | 0f8a1b29d276b3ad126ecd483ffa76a0bf6d9590 (diff) | |
Merge 'master' and 'stdenv-fixes' into x-updates
Final stabilization phase before merging into master.
Conflicts (glibc-2.13):
pkgs/top-level/all-packages.nix