| commit | daed4c56b28b805d2b1e2b3d91fa0af1170fc21a | |
| author | Tails developers <amnesia@boum.org> | |
| Tue, 26 Aug 2014 12:15:37 +0000 (26 14:15 +0200) | ||
| committer | Tails developers <amnesia@boum.org> | |
| Tue, 26 Aug 2014 12:15:37 +0000 (26 14:15 +0200) | ||
| tree | fae2f274415ba09a6c5a53fa08cc80e3978448dc | treesnapshot (tar.gz zip) |
| parent | b1a4ca90ddaf1c51541ded0f2fbfee31432c0ef2 | commitdiff |
| parent | 1b3fb279451445467e6423cfd02f1b4f8448e00c | commitdiff |
Merge remote-tracking branch 'origin/test/7712-hostname-leaks' into stable
Conflicts:
features/step_definitions/common_steps.rb
Conflicts:
features/step_definitions/common_steps.rb
| features/step_definitions/common_steps.rb | diff1 | diff2 | blobhistory |