| commit | 914521443e0138df1e1f356dcc9e691232c91b52 | |
| author | Tails developers <amnesia@boum.org> | |
| Sun, 31 Aug 2014 19:44:53 +0000 (31 21:44 +0200) | ||
| committer | Tails developers <amnesia@boum.org> | |
| Sun, 31 Aug 2014 19:44:53 +0000 (31 21:44 +0200) | ||
| tree | 37bb90dbb87917b1a40756b673056b47f94907cd | treesnapshot (tar.gz zip) |
| parent | 9c42fd30c49455973a4e3fcf17722fe4cf222f5b | commitdiff |
| parent | e87b845f6a301011bea140a1e96bf5ffdf4f4671 | commitdiff |
Merge remote-tracking branch 'origin/master' into stable
Conflicts:
wiki/src/doc/anonymous_internet/i2p.pt.po
Conflicts:
wiki/src/doc/anonymous_internet/i2p.pt.po