diff options
| author | Peter Simons <simons@cryp.to> | 2013-08-17 10:00:16 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2013-08-17 10:00:16 +0200 |
| commit | 0d7118814b68e52e9b36173463b18a9c4aa4ab3e (patch) | |
| tree | c5f0c9aea8ce3085815e1d0490def28718e6f014 | |
| parent | 76244ac2e2c0e1b82717655062d7929e9b64a5da (diff) | |
| parent | 898348a80d06b023d149980d620868695ce25598 (diff) | |
Merge branch 'origin/master' into stdenv.