Merge remote-tracking branch 'origin/master' into testing
commitc8b84c77ef8eddbc0c2092a2bcc1219333a895ac
authorTails developers <amnesia@boum.org>
Sun, 20 Jul 2014 12:43:15 +0000 (20 12:43 +0000)
committerTails developers <amnesia@boum.org>
Sun, 20 Jul 2014 12:43:15 +0000 (20 12:43 +0000)
tree5f3850cc9fe2a61775d3bb4bf36e7222a1baee88
parent7826289f3f6916e4371d4c954a2055f71346edc0
parent69ee0ee3903aa0a8960c28f4050fe1b2af08b756
Merge remote-tracking branch 'origin/master' into testing

Conflicts:
wiki/src/doc/first_steps/persistence/change_passphrase.pt.po
wiki/src/doc/first_steps/persistence/copy.pt.po
wiki/src/doc/first_steps/persistence/use.pt.po
wiki/src/contribute/working_together/roles/release_manager.mdwn
wiki/src/doc/first_steps/persistence/change_passphrase.pt.po
wiki/src/doc/first_steps/persistence/configure.pt.po
wiki/src/doc/first_steps/persistence/copy.pt.po
wiki/src/doc/first_steps/persistence/delete.pt.po
wiki/src/doc/first_steps/persistence/use.pt.po