diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2016-05-18 17:10:02 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-05-18 17:10:02 +0200 |
| commit | f8d481754cf842ca6e6ac1427ce0f571f5a44108 (patch) | |
| tree | 70e702285987429aed275e0d5e2dc15c050e1f8c | |
| parent | 9fbc20e2f89bc045efac7ade41949a2c2d571dec (diff) | |
| parent | 3cd63ade1614d4c581735ffb0cebe181bf87dfc8 (diff) | |
Merge remote-tracking branch 'origin/master' into hardened-stdenv