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

..

1.0.1-cygwin64.patch

…

1.0.2.x.nix

openssl_1_0_2: high-severity security update e -> f

2016-01-28 20:35:00 +01:00

darwin-arch.patch

…

default.nix

Merge recent 'staging' into closure-size

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