Vladimír Čunát 6b27ceb006 Merge 'master' into staging and re-revert merge ...

... from staging to master, reverted temporarily in aa9a04883e.

2016-06-23 12:09:03 +02:00

..

default.nix

Merge 'master' into staging and re-revert merge

2016-06-23 12:09:03 +02:00

git.nix

Revert "Merge branch 'staging'" due to glibc

2016-06-23 09:25:10 +02:00