| commit | bf01b4b4addda98a1e0efdb3c5c8a2d97bba7add | |
| author | Tails developers <amnesia@boum.org> | |
| Fri, 10 Jan 2014 14:09:14 +0000 (10 14:09 +0000) | ||
| committer | Tails developers <amnesia@boum.org> | |
| Fri, 10 Jan 2014 14:09:14 +0000 (10 14:09 +0000) | ||
| tree | b2952db31d994620459c85c36cb565c087d16440 | treesnapshot (tar.gz zip) |
| parent | d27a635927a80f5dbdb8cca66f12e7a824e5e510 | commitdiff |
| parent | 2b14454426f1768e63dd667a61f3626ceff875db | commitdiff |
Merge remote-tracking branch 'origin/master' into stable
Conflicts:
wiki/src/doc/about/features.es.po
Conflicts:
wiki/src/doc/about/features.es.po