Vladimír Čunát ae74c356d9 Merge recent 'staging' into closure-size ...

Let's get rid of those merge conflicts.

2016-02-03 16:57:19 +01:00

..

default.nix

Merge recent 'staging' into closure-size

2016-02-03 16:57:19 +01:00